Michael Telatynski 1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 ... Conflicts: src/components/structures/SpaceRoomView.tsx src/components/views/dialogs/BetaFeedbackDialog.tsx		2021-07-23 18:28:21 +01:00
..
SpaceBasicSettings.tsx	Adhere to better eslint rules	2021-07-23 10:35:10 +01:00
SpaceCreateMenu.tsx	Change spaces beta feedback to not be so beta-centric	2021-07-23 15:47:11 +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	Remove spaces beta feedback prompts except a couple more strategic ones	2021-07-23 15:07:24 +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