(cherry picked from commit cf14831fbe6d3b6b07d0fe185194d27d6ac6ae17) # Conflicts: # app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt # app/src/main/java/eu/kanade/presentation/reader/settings/GeneralSettingsPage.kt # app/src/main/java/eu/kanade/presentation/reader/settings/ReadingModePage.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt |
||
|---|---|---|
| .. | ||
| src/main | ||
| .gitignore | ||
| build.gradle.kts | ||
| consumer-rules.pro | ||
| proguard-rules.pro | ||