NerdNumber9 03cb7062f2 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:43:06 -05:00

..

src

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

2017-03-04 22:43:06 -05:00

.gitignore

Add EH code.

2017-01-02 18:02:10 -05:00

build.gradle

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

2017-03-04 22:43:06 -05:00

proguard-rules.pro

Add EH code.

2017-01-02 18:02:10 -05:00