(cherry picked from commit 9670863a418c39d2371e20b20557e7075961cb5e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt |
||
|---|---|---|
| .. | ||
| chapter | ||
| info | ||
| merged | ||
| track | ||
| EditMangaDialog.kt | ||
| MangaController.kt | ||
| MangaPresenter.kt | ||
(cherry picked from commit 9670863a418c39d2371e20b20557e7075961cb5e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt |
||
|---|---|---|
| .. | ||
| chapter | ||
| info | ||
| merged | ||
| track | ||
| EditMangaDialog.kt | ||
| MangaController.kt | ||
| MangaPresenter.kt | ||