Files
element-web/src
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-10 15:43:46 +01:00
2021-07-17 15:37:52 +02:00
2021-07-14 19:16:34 +01:00
2021-07-20 07:47:31 -04:00
2021-07-09 14:13:31 +02:00
2021-07-20 10:33:52 +01:00
2021-07-10 16:00:04 +01:00
2021-07-10 15:43:46 +01:00