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