
(cherry picked from commit 4a6571d310ecf2bf77e86a303f1788aaaab3df25) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/di/AppModule.kt # app/src/main/java/eu/kanade/tachiyomi/source/SourceExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/source/model/SMangaExtensions.kt