(cherry picked from commit 0e2b8b10d1dd7232c0c11f331e3f5116d90c92dd) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt |
||
|---|---|---|
| .. | ||
| chapter | ||
| info | ||
| merged | ||
| track | ||
| EditMangaDialog.kt | ||
| MangaController.kt | ||
| MangaPresenter.kt | ||
(cherry picked from commit 0e2b8b10d1dd7232c0c11f331e3f5116d90c92dd) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt |
||
|---|---|---|
| .. | ||
| chapter | ||
| info | ||
| merged | ||
| track | ||
| EditMangaDialog.kt | ||
| MangaController.kt | ||
| MangaPresenter.kt | ||