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