NerdNumber9 a71ae29c98 Add Tsumino captcha display and merge branch 'master' of upstream ... # Conflicts: # .github/readme-images/app-icon.png # .github/readme-images/screens.png # .travis.yml # README.md # app/build.gradle # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt # app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt # app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSource.kt # app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSourceMappings.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/util/DynamicConcurrentMergeOperator.java		2018-02-24 11:13:43 -05:00
..
src	Add Tsumino captcha display and merge branch 'master' of upstream	2018-02-24 11:13:43 -05:00
.gitignore	Upstream merge	2017-05-04 23:38:17 -04:00
build.gradle	Add Tsumino captcha display and merge branch 'master' of upstream	2018-02-24 11:13:43 -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