Michael Telatynski 18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ...

 Conflicts:

	src/stores/SpaceStore.tsx

2021-07-22 12:44:27 +01:00

..

SpaceBasicSettings.tsx

Comply with new member-delimiter-style rule

2021-07-01 23:23:03 +01:00

SpaceCreateMenu.tsx

Fix Space Create menu not disabling the alias field when busy

2021-07-08 13:24:56 +01:00

SpacePanel.tsx

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room

2021-07-22 08:25:24 +05:30

SpacePublicShare.tsx

Use sleep from js-sdk as no point duplicating it

2021-07-01 22:55:27 +01:00

SpaceSettingsGeneralTab.tsx

Conform to new react and typescript eslint rules

2021-07-19 22:43:11 +01:00

SpaceSettingsVisibilityTab.tsx

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

2021-07-21 10:46:41 +01:00

SpaceTreeLevel.tsx

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

2021-07-22 12:44:27 +01:00