(cherry picked from commit fa5d2276c0c6777c1fc1d61d916a37c7d8c00c06) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit fa5d2276c0c6777c1fc1d61d916a37c7d8c00c06) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||