NerdNumber9 9af552c15a Merge branch 'master' of https://github.com/inorichi/tachiyomi ... # Conflicts: # README.md # app/build.gradle # app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/NoResultsException.kt # app/src/main/java/eu/kanade/tachiyomi/ui/latest_updates/LatestUpdatesPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt		2017-12-07 23:20:27 -05:00
..
src	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2017-12-07 23:20:27 -05:00
.gitignore	Upstream merge	2017-05-04 23:38:17 -04:00
build.gradle	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2017-12-07 23:20:27 -05: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