|
|
5f48bb8e7d
|
Merge branch 'master' of https://github.com/inorichi/tachiyomi
# Conflicts:
# README.md
# app/build.gradle
# app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
# app/src/main/java/eu/kanade/tachiyomi/data/source/SourceManager.kt
# app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/backup/BackupPresenter.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogFragment.kt
# app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
# app/src/main/res/raw/changelog_release.xml
# app/src/main/res/values/arrays.xml
# app/src/main/res/values/strings.xml
|
2017-03-04 22:54:00 -05:00 |
|
