(cherry picked from commit 6cd34614f607c51a62eed68d98996990969e5909) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi | ||
(cherry picked from commit 6cd34614f607c51a62eed68d98996990969e5909) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi | ||