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
