Manually resolved merge conflicts from https://hosted.weblate.org/git/tachiyomi/strings/ (cherry picked from commit f3c50ee9a36c0bb7b047cf36b47ac6fdda509840) |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-android-optimize.txt | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||