
(cherry picked from commit 6a558ad119ff35336c2141deefc5da4b49cf4553) # Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/tachiyomi/AppModule.kt # data/src/main/java/tachiyomi/data/manga/MangaMapper.kt # data/src/main/java/tachiyomi/data/manga/MangaRepositoryImpl.kt # data/src/main/sqldelight/tachiyomi/data/mangas.sq