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
..
structures	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1	2021-07-12 18:58:18 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1	2021-07-12 18:58:18 +01:00