Manually resolved merge conflicts from https://hosted.weblate.org/git/tachiyomi/strings/ (cherry picked from commit f3c50ee9a36c0bb7b047cf36b47ac6fdda509840) |
||
|---|---|---|
| .. | ||
| java | ||
| res | ||
| sqldelight | ||
| AndroidManifest.xml | ||
| ic_launcher-web.png | ||
Manually resolved merge conflicts from https://hosted.weblate.org/git/tachiyomi/strings/ (cherry picked from commit f3c50ee9a36c0bb7b047cf36b47ac6fdda509840) |
||
|---|---|---|
| .. | ||
| java | ||
| res | ||
| sqldelight | ||
| AndroidManifest.xml | ||
| ic_launcher-web.png | ||