NerdNumber9 615fa05a75 Merge branch 'master' of https://github.com/inorichi/tachiyomi ...

# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
#	app/src/main/res/layout/manga_info_controller.xml
#	app/src/main/res/raw/changelog_release.xml

2018-03-13 15:58:47 -04:00

..

ChapterRecognition.kt

Merge remote-tracking branch 'upstream/master'

2018-01-29 12:16:32 -05:00

ChapterSourceSync.kt

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

2018-02-24 11:13:43 -05:00

ContextExtensions.kt

Sync is now essentially fully atomic on the client side

2018-02-02 12:11:09 -05:00

CoroutinesExtensions.kt

Dependency updates

2018-02-18 20:02:31 +01:00

DiskUtil.kt

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

2018-02-24 11:13:43 -05:00

FileExtensions.kt

Merge remote-tracking branch 'upstream/master'

2018-01-29 12:16:32 -05:00

GLUtil.java

Upstream merge

2017-05-04 23:38:17 -04:00

Hash.kt

Downloading extensions from Github Repo. (#1101)

2018-02-05 22:50:56 +01:00

ImageViewExtensions.kt

Upstream merge

2017-05-04 23:38:17 -04:00

JsoupExtensions.kt

Merge branch 'master' of https://github.com/inorichi/tachiyomi

2017-08-24 11:24:23 -04:00

LocaleHelper.kt

Merge branch 'master' of https://github.com/inorichi/tachiyomi

2018-03-13 15:58:47 -04:00

OkioExtensions.kt

Upstream merge

2017-05-04 23:38:17 -04:00

RarContentProvider.kt

Upstream merge

2017-05-04 23:38:17 -04:00

RetryWithDelay.kt

Upstream merge

2017-05-04 23:38:17 -04:00

RxExtensions.kt

Upstream merge

2017-05-04 23:38:17 -04:00

SharedData.kt

Upstream merge

2017-05-04 23:38:17 -04:00

StringExtensions.kt

Merge remote-tracking branch 'upstream/master'

2018-01-29 12:16:32 -05:00

ViewExtensions.kt

Merge upstream changes

2017-11-29 21:53:02 -05:00

ViewGroupExtensions.kt

Upstream merge

2017-05-04 23:38:17 -04:00

ZipContentProvider.kt

Upstream merge

2017-05-04 23:38:17 -04:00