3 Commits

Author	SHA1	Message	Date
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
Ken Swenson	aa7dfb7bee	Update README.md (#1241) ... Include CONTRIBUTING.md guidelines as collapseable elements. Remove white background from screenshots Optimize app-icon.png and screens.png using `optipng -o2`	2018-02-17 13:01:46 +01:00
Philippe Kimura-Thollander	ac88f1c146	Update README (#1142) ... * Update README.md * add pics to readme * Update README.md * change language from stable to just "app" * Update README.md * update with feedback * change test to try * add link to extentions repo	2018-01-05 22:54:41 +01:00