NerdNumber9 8c8f2585aa Merge remote-tracking branch 'upstream/master' ...

# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdateDownloaderReceiver.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoPresenter.kt
#	app/src/main/res/menu/library.xml
#	app/src/main/res/values/strings.xml
#	app/src/test/java/eu/kanade/tachiyomi/data/database/ChapterRecognitionTest.kt

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

..

src

Merge remote-tracking branch 'upstream/master'

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

.gitignore

Upstream merge

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

build.gradle

Merge remote-tracking branch 'upstream/master'

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

proguard-rules.pro

Merge upstream changes

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

shortcuts.xml

Update Android Studio to 3.0

2017-10-28 14:44:19 +02:00