(cherry picked from commit f430b6f853cb61734d4c31d84be970aad94d1639) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt # app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||