element-web/src/components/views/settings/tabs/room
Michael Telatynski 5ccd02dd6e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/messages/MImageBody.tsx
2021-07-23 10:42:46 +01:00
..
AdvancedRoomSettingsTab.tsx Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
BridgeSettingsTab.tsx Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
GeneralRoomSettingsTab.js Adhere to better eslint rules 2021-07-23 10:35:10 +01:00
NotificationSettingsTab.js Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
RolesRoomSettingsTab.tsx Adhere to better eslint rules 2021-07-23 10:35:10 +01:00
SecurityRoomSettingsTab.tsx Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1 2021-07-23 10:42:46 +01:00