Auto-merging vector/src/main/res/values-uk/strings.xml CONFLICT (content): Merge conflict in vector/src/main/res/values-uk/strings.xml Auto-merging vector/src/main/res/values-ru/strings.xml Auto-merging vector/src/main/res/values-nl/strings.xml Auto-merging vector/src/main/res/values-ja/strings.xml Auto-merging vector/src/main/res/values-es/strings.xml Auto-merging vector/src/main/java/im/vector/adapters/RoomInvitationViewHolder.java Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
ylecollen
Resource update
[Deprecated] Riot Android / [DEPRECATED] Riot Android — Chinese (Traditional)
ylecollen
Resource update
[Deprecated] Riot Android / [DEPRECATED] Riot Android — Chinese (Simplified)
ylecollen
Resource update
[Deprecated] Riot Android / [DEPRECATED] Riot Android — Portuguese (Brazil)