(cherry picked from commit 9de08c8166749a8959f27c78185060b00269e372) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt |
||
|---|---|---|
| .. | ||
| src/main/kotlin | ||
| .gitignore | ||
| build.gradle.kts | ||
(cherry picked from commit 9de08c8166749a8959f27c78185060b00269e372) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt |
||
|---|---|---|
| .. | ||
| src/main/kotlin | ||
| .gitignore | ||
| build.gradle.kts | ||