(cherry picked from commit 532a1b1abacde1a35e4c0bfcf9f083e59f6924b5) # 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 |
||
|---|---|---|
| .. | ||
| androidx/preference | ||
| com/google/android/material | ||
| eu/kanade/tachiyomi | ||
| exh | ||
| xyz/nulldev/ts/api/http/serializer | ||