Files
element-web/res/css/views/dialogs
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
..
2021-07-28 19:23:33 +01:00
2020-10-29 15:57:16 +00:00
2020-07-08 18:02:30 +02:00