
(cherry picked from commit 9a817e49bed34e11e6b24b48d738d14583440fae) # Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/data/backup/models/BackupManga.kt # data/src/main/sqldelight/tachiyomi/migrations/25.sqm # domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt