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