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