Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 ... Conflicts: src/components/views/room_settings/AliasSettings.tsx		2021-06-22 22:02:09 +01:00
..
AliasSettings.tsx	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244	2021-06-22 22:02:09 +01:00
RelatedGroupSettings.js	Convert a bunch more js-sdk imports to absolute paths	2021-03-18 20:50:34 -06:00
RoomProfileSettings.js	Enable indent rule and fix indent	2021-04-27 17:23:27 +02:00
RoomPublishSetting.tsx	Iterate PR	2021-06-22 22:01:18 +01:00
UrlPreviewSettings.js	Enable indent rule and fix indent	2021-04-27 17:23:27 +02:00