(cherry picked from commit 3f0db60a999cb30ff249ae4cc6a720c2a49c319a) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/kotlin | ||
(cherry picked from commit 3f0db60a999cb30ff249ae4cc6a720c2a49c319a) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/kotlin | ||