(cherry picked from commit 4efb736e56dd1e9f6438502dac915467f5b64f03) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt # app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
(cherry picked from commit 4efb736e56dd1e9f6438502dac915467f5b64f03) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt # app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt