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