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
..
2021-07-02 13:20:02 +02:00
2021-06-29 13:11:58 +01:00
2021-07-20 09:37:54 +01:00
2021-06-29 13:11:58 +01:00
2021-07-20 09:37:54 +01:00
2021-06-29 13:11:58 +01:00
2021-06-29 13:11:58 +01:00
2021-06-29 13:11:58 +01:00
2021-07-20 09:27:32 +01:00
2021-06-29 13:11:58 +01:00