NerdNumber9 71c10df270 Merge branch 'master' of https://github.com/inorichi/tachiyomi ... # Conflicts: # README.md # app/.gitignore # app/build.gradle # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAboutController.kt # app/src/main/res/raw/changelog_release.xml		2018-06-09 19:52:02 -04:00
..
src	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2018-06-09 19:52:02 -04:00
.gitignore	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2018-06-09 19:52:02 -04:00
build.gradle	Merge branch 'master' of https://github.com/inorichi/tachiyomi	2018-06-09 19:52:02 -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