mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 16:11:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
element-web/src/i18n
History
Michael Telatynski efd8a2f9b0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
..
strings Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-29 15:16:53 +01:00