NerdNumber9 b766ddea54 Merge branch 'master' of https://github.com/inorichi/tachiyomi ... Fix back button in library search		2017-11-29 21:41:05 -05:00
..
assets/fonts	Upstream merge	2017-05-04 23:38:17 -04:00
java	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2017-11-29 21:41:05 -05:00
res	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2017-11-29 21:41:05 -05:00
AndroidManifest.xml	Merge upstream changes	2017-11-29 21:53:02 -05:00
ic_launcher-web.png	Upstream merge	2017-05-04 23:38:17 -04:00