
(cherry picked from commit 1a559124eb9e029a6146bf2660cbd508941c20d4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt
(cherry picked from commit 1a559124eb9e029a6146bf2660cbd508941c20d4) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt # app/src/main/java/eu/kanade/tachiyomi/data/backup/restore/BackupRestorer.kt