element-web/src/components/views/room_settings
Michael Telatynski ae6eaa5acc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1
 Conflicts:
	src/components/structures/RoomDirectory.tsx
	src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-12 18:58:18 +01:00
..
AliasSettings.tsx Auto-fix lint errors 2021-06-29 13:11:58 +01:00
RelatedGroupSettings.js Auto-fix lint errors 2021-06-29 13:11:58 +01:00
RoomProfileSettings.js Auto-fix lint errors 2021-06-29 13:11:58 +01:00
RoomPublishSetting.tsx Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1 2021-07-12 18:58:18 +01:00
UrlPreviewSettings.js Auto-fix lint errors 2021-06-29 13:11:58 +01:00