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