(cherry picked from commit 322d66d2825fe4d2e4650fb26e4aaf2f1bb96dbc) # 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 322d66d2825fe4d2e4650fb26e4aaf2f1bb96dbc) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||