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

 Conflicts:

	src/components/views/avatars/RoomAvatar.tsx

	test/stores/SpaceStore-test.ts

	test/test-utils.js

2021-07-19 16:47:31 +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

Cache value of feature_spaces* flags as they cause page refresh so are immutable

2021-07-15 08:26:49 +01:00

SpacePublicShare.tsx

Use sleep from js-sdk as no point duplicating it

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

SpaceSettingsGeneralTab.tsx

Don't close settings dialog when opening spaces feedback prompt

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

SpaceSettingsVisibilityTab.tsx

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

2021-07-15 10:04:48 +01:00

SpaceTreeLevel.tsx

Add new in the spaces beta toast & explanatory modal

2021-07-02 16:07:17 +01:00