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