matrix-react-sdk

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

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