element-web/src/components/views/settings/tabs/room
Michael Telatynski f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
2021-07-09 08:13:39 +01:00
..
AdvancedRoomSettingsTab.tsx Auto-fix lint errors 2021-06-29 13:11:58 +01:00
BridgeSettingsTab.tsx Auto-fix lint errors 2021-06-29 13:11:58 +01:00
GeneralRoomSettingsTab.js Auto-fix lint errors 2021-06-29 13:11:58 +01:00
NotificationSettingsTab.js Auto-fix lint errors 2021-06-29 13:11:58 +01:00
RolesRoomSettingsTab.tsx Fifth batch of burning 2021-07-03 10:06:42 +02:00
SecurityRoomSettingsTab.tsx Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-07-09 08:13:39 +01:00