NerdNumber9 5cfdbbce7a Merge branch 'master' of https://github.com/inorichi/tachiyomi ... # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt		2018-07-08 15:51:26 -04:00
..
readme-images	Add Tsumino captcha display and merge branch 'master' of upstream	2018-02-24 11:13:43 -05:00
CONTRIBUTING.md	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2018-06-09 19:52:02 -04:00
ISSUE_TEMPLATE.md	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2018-07-08 15:51:26 -04:00