(cherry picked from commit 44366ac0580d3e51c03cbed8530e48ebe37f2e1f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi/util/chapter | ||
(cherry picked from commit 44366ac0580d3e51c03cbed8530e48ebe37f2e1f) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi/util/chapter | ||