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
..