(cherry picked from commit 6e04822f5e2f0985a98a86c814099b0cf85cb7f8) # Conflicts: # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsReaderScreen.kt # app/src/main/java/eu/kanade/tachiyomi/App.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderPreferences.kt # app/src/main/java/eu/kanade/tachiyomi/util/system/BuildConfig.kt |
||
|---|---|---|
| .. | ||
| BasePreferences.kt | ||