(cherry picked from commit 63f3180dff643355a000ff4071105a12139d18b0) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit 63f3180dff643355a000ff4071105a12139d18b0) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||