(cherry picked from commit d21c1472038ab8cba072b1d1085a15f6c11e424e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/AppModule.kt
(cherry picked from commit d21c1472038ab8cba072b1d1085a15f6c11e424e) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/AppModule.kt