element-web/src/components
Michael Telatynski 6d0af83df4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
 Conflicts:
	src/components/views/dialogs/LeaveSpaceDialog.tsx
	src/i18n/strings/en_EN.json
2021-09-27 11:19:49 +01:00
..
structures Fix the User View 2021-09-24 14:35:00 +01:00
views Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 2021-09-27 11:19:49 +01:00