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