991c2284ac
# Conflicts: # .github/workflows/TachiyomiSY-Release-Builder.yml # .github/workflows/build_check.yml # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt # app/src/main/java/eu/kanade/tachiyomi/data/database/queries/RawQueries.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt # app/src/main/java/eu/kanade/tachiyomi/data/track/TrackManager.kt # app/src/main/java/eu/kanade/tachiyomi/data/track/TrackStatus.kt # app/src/main/java/eu/kanade/tachiyomi/data/updater/AppUpdateChecker.kt # app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt # app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessAdapter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabaseController.kt # app/src/main/java/eu/kanade/tachiyomi/util/MangaExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt # app/src/main/java/eu/kanade/tachiyomi/util/system/ImageUtil.kt # app/src/main/java/exh/merged/sql/queries/MergedQueries.kt # app/src/main/res/values/strings.xml # buildSrc/src/main/kotlin/AndroidConfig.kt # gradle/androidx.versions.toml # gradle/libs.versions.toml