(cherry picked from commit 431f8772f8ad2f30d71bb6565ec2644e4e56c691) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt |
||
|---|---|---|
| .. | ||
| src/main | ||
| .gitignore | ||
| build.gradle.kts | ||
| consumer-rules.pro | ||
| proguard-rules.pro | ||
(cherry picked from commit 431f8772f8ad2f30d71bb6565ec2644e4e56c691) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt |
||
|---|---|---|
| .. | ||
| src/main | ||
| .gitignore | ||
| build.gradle.kts | ||
| consumer-rules.pro | ||
| proguard-rules.pro | ||