arkon 1d6aa9a277 Merge branch 'patch' ... # Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt # app/src/main/java/eu/kanade/tachiyomi/data/notification/NotificationReceiver.kt # app/src/main/java/eu/kanade/tachiyomi/data/saver/ImageSaver.kt # app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallReceiver.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/SearchableNucleusController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationFlags.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/AddDuplicateMangaDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt # app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt # app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSorter.kt # app/src/main/res/layout/pref_settings.xml # app/src/test/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognitionTest.kt # gradle/androidx.versions.toml # gradle/libs.versions.toml		2022-08-14 11:28:28 -04:00
..
src	Merge branch 'patch'	2022-08-14 11:28:28 -04:00
.gitignore
build.gradle.kts	Merge branch 'patch'	2022-08-14 11:28:28 -04:00
proguard-android-optimize.txt	Adjust R8 optimization configs to fix extension issues	2022-05-26 19:41:43 -04:00
proguard-rules.pro	Downgrade R8 to avoid extension issues	2022-05-26 22:33:18 -04:00
shortcuts.xml