(cherry picked from commit 80635343aee56a5aa051403b70d41195be977c65) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt |
||
|---|---|---|
| .. | ||
| wrapper | ||
| androidx.versions.toml | ||
| kotlinx.versions.toml | ||
| libs.versions.toml | ||
| sy.versions.toml | ||
(cherry picked from commit 80635343aee56a5aa051403b70d41195be977c65) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt |
||
|---|---|---|
| .. | ||
| wrapper | ||
| androidx.versions.toml | ||
| kotlinx.versions.toml | ||
| libs.versions.toml | ||
| sy.versions.toml | ||