Michael Telatynski 020eca6922 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19010 ...

 Conflicts:

	src/components/structures/SpaceRoomView.tsx

	src/components/views/rooms/MemberList.tsx

	src/components/views/rooms/RoomList.tsx

2021-10-14 11:05:29 +01:00

..

structures

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

2021-10-14 11:05:29 +01:00

views

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

2021-10-14 11:05:29 +01:00