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