
(cherry picked from commit 12abd9938b7c235d6a1c02391624703476c1f339) # Conflicts: # CHANGELOG.md # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt # data/src/main/java/tachiyomi/data/manga/MangaMapper.kt
(cherry picked from commit 12abd9938b7c235d6a1c02391624703476c1f339) # Conflicts: # CHANGELOG.md # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt # data/src/main/java/tachiyomi/data/manga/MangaMapper.kt