
(cherry picked from commit 0bf14fd31c9b1d3274be23acabf4d34f18864f90) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt
(cherry picked from commit 0bf14fd31c9b1d3274be23acabf4d34f18864f90) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt