6be8e2de3c
(cherry picked from commit b6b78994d8)
# Conflicts:
# app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt