Michael Telatynski 390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/dialogs/CreateRoomDialog.tsx src/components/views/dialogs/RoomUpgradeDialog.tsx src/components/views/dialogs/RoomUpgradeWarningDialog.tsx src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx		2021-07-21 10:46:41 +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	Conform to new react and typescript eslint rules	2021-07-19 22:43:11 +01:00
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-21 10:46:41 +01:00