(cherry picked from commit f115edf2eac125d0e6a0fdec79bd9d6627c3c53b) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/kotlin | ||
(cherry picked from commit f115edf2eac125d0e6a0fdec79bd9d6627c3c53b) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/kotlin | ||