2 Commits

Author	SHA1	Message	Date
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
Michael Telatynski	e8f0412fe3	Add way to manage Restricted join rule in Room Settings	2021-07-02 14:51:55 +01:00