Auto-merging vector/src/main/res/values-uk/strings.xml Auto-merging vector/src/main/res/values-sk/strings.xml Auto-merging vector/src/main/res/values-pt/strings.xml Auto-merging vector/src/main/res/values-ja/strings.xml CONFLICT (content): Merge conflict in vector/src/main/res/values-ja/strings.xml Auto-merging vector/src/main/res/values-it/strings.xml Auto-merging vector/src/main/res/values-fr/strings.xml Auto-merging vector/src/main/res/values-eu/strings.xml Auto-merging vector/src/main/res/values-de/strings.xml Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
bmarty
Resource update
[Deprecated] Riot Android / [DEPRECATED] Riot Android — Chinese (Traditional)