Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-12-02 09:26:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
847e3dcbce
element-web-Github/src/i18n
History
Michael Telatynski 847e3dcbce Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1 
 Conflicts:
	src/dispatcher/actions.ts
2021-06-22 14:11:37 +01:00
..
strings Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1 2021-06-22 14:11:37 +01:00