(cherry picked from commit b8ffb87f01ddda5e09e97170aa5d3287743d6d70) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit b8ffb87f01ddda5e09e97170aa5d3287743d6d70) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/migration/MigrationController.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||