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
..
debug/res	Add adaptive icon and a dev variant	2018-01-13 18:15:00 +01:00
main	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2018-07-08 15:51:26 -04:00
test/java/eu/kanade/tachiyomi	Fix chapter recognition regex and detail number (#1213)	2018-01-26 14:32:34 +01:00