(cherry picked from commit 52416ff3a85bd6f17fb12f218398c5c9fd198397) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi | ||
(cherry picked from commit 52416ff3a85bd6f17fb12f218398c5c9fd198397) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi | ||