
(cherry picked from commit 356b7c346aba9dd0fafbb089c56de11ac50d1065) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
(cherry picked from commit 356b7c346aba9dd0fafbb089c56de11ac50d1065) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/cache/ChapterCache.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt