Michael Telatynski 5a80530eff Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4 ...

 Conflicts:

	src/components/structures/RoomDirectory.tsx

	src/components/views/room_settings/RoomPublishSetting.tsx

2021-07-13 15:46:48 +01:00

..

structures

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4

2021-07-13 15:46:48 +01:00

views

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4

2021-07-13 15:46:48 +01:00