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
..
src	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2018-07-08 15:51:26 -04:00
.gitignore	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2018-06-09 19:52:02 -04:00
build.gradle	Bump version to v7.4.1	2018-06-10 12:19:53 -04:00
proguard-rules.pro	Merge upstream changes	2017-11-29 21:53:02 -05:00
shortcuts.xml	Update Android Studio to 3.0	2017-10-28 14:44:19 +02:00