(cherry picked from commit 3ad4f1114adc88189032e4face152db9ed89df55) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt # app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateJob.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/kotlin | ||