Michael Telatynski 66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 ...

 Conflicts:

	package.json

	yarn.lock

2021-06-14 21:39:06 +01:00

..

SpaceBasicSettings.tsx

Fix handling of enter/return in space creation menu

2021-05-10 14:39:10 +01:00

SpaceCreateMenu.tsx

Move various createRoom types to the js-sdk

2021-06-14 13:31:58 -06:00

SpacePanel.tsx

First cut of space panel drag-and-drop ordering

2021-06-03 08:32:36 +01:00

SpacePublicShare.tsx

Fix share space edge case where space is public but not invitable

2021-05-14 10:46:09 +01:00

SpaceTreeLevel.tsx

First cut of space panel drag-and-drop ordering

2021-06-03 08:32:36 +01:00