Commit Graph

2 Commits (e78a1adb6f1af2ea425b0bae9034fb7344a4b2e8)

Author SHA1 Message Date
Michael Telatynski 5ccd02dd6e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/messages/MImageBody.tsx
2021-07-23 10:42:46 +01:00
Michael Telatynski 89949bd884 Add new in the spaces beta toast & explanatory modal 2021-07-02 16:07:17 +01:00