matrix-react-sdk

83bf1e8d - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces_feature

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces_feature
Conflicts:
src/@types/global.d.ts
src/components/structures/RoomView.tsx
src/components/views/dialogs/InviteDialog.tsx
src/components/views/rooms/RoomList.tsx
src/dispatcher/actions.ts
src/i18n/strings/en_EN.json