NerdNumber9 07ce90ab8c 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-25 15:34:19 -05:00

..

ExGalleryMetadata.kt

Fix broken favorites sync

2018-02-15 17:21:33 -05:00

GalleryQuery.kt

Initial implementation of favorites syncing

2018-01-31 22:39:55 -05:00

HentaiCafeMetadata.kt

See CHANGELOG.md for this commit

2017-12-07 22:25:27 -05:00

NHentaiMetadata.kt

Fix gallery browsing

2018-02-12 16:22:54 -05:00

PervEdenGalleryMetadata.kt

Rewrite link intercept activity

2018-01-29 15:39:34 -05:00

SearchableGalleryMetadata.kt

Various changes

2017-11-29 21:44:35 -05:00

Tag.kt

Migrate to realm for metadata

2017-08-25 17:31:38 -04:00

TsuminoMetadata.kt

Add Tsumino captcha display and merge branch 'master' of upstream

2018-02-25 15:34:19 -05:00