(cherry picked from commit 1a8155c45b087eca4ecf6283402c5ff2c4cdfbe6) # Conflicts: # app/src/main/res/values/strings.xml |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi | ||
(cherry picked from commit 1a8155c45b087eca4ecf6283402c5ff2c4cdfbe6) # Conflicts: # app/src/main/res/values/strings.xml |
||
|---|---|---|
| .. | ||
| debug/res | ||
| main | ||
| test/java/eu/kanade/tachiyomi | ||