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-06-29 13:11:58 +01:00
2021-07-15 10:59:52 +01:00
2017-06-01 21:10:32 +02:00
2020-09-15 13:19:47 +01:00
2016-10-11 14:20:40 +01:00
2021-06-29 13:11:58 +01:00
2021-07-12 13:52:10 -06:00
2021-06-04 16:52:50 +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