(cherry picked from commit 32bed9b041d76a6bac699c56c78d1692b71dfc0b) # Conflicts: # app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt # domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt |
||
|---|---|---|
| .. | ||
| main | ||
| test/java/tachiyomi/domain | ||
(cherry picked from commit 32bed9b041d76a6bac699c56c78d1692b71dfc0b) # Conflicts: # app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt # domain/src/main/java/tachiyomi/domain/manga/model/Manga.kt |
||
|---|---|---|
| .. | ||
| main | ||
| test/java/tachiyomi/domain | ||