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
