(cherry picked from commit a3c598a3e1758c00d00ad3a804d8dbb7e24ab2ac) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceHolder.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||