(cherry picked from commit d912a42249901e5c0e3d2e4c09d8d9b89ef6bb3d) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi | ||
(cherry picked from commit d912a42249901e5c0e3d2e4c09d8d9b89ef6bb3d) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi | ||