Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 ... Conflicts: src/components/views/room_settings/AliasSettings.tsx		2021-06-22 22:02:09 +01:00
..
_SpaceBasicSettings.scss	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244	2021-06-22 22:02:09 +01:00
_SpaceCreateMenu.scss	Fix colours used for the back button in space create menu	2021-05-12 10:48:06 +01:00
_SpacePublicShare.scss	Consolidate button styles in Space creation flows	2021-03-19 13:20:30 +00:00