9b3a839515
(cherry picked from commit 532a1b1aba)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/CategoryTypeMapping.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/mappers/MangaTypeMapping.kt
# app/src/main/java/eu/kanade/tachiyomi/data/database/resolvers/LibraryMangaGetResolver.kt