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

 Conflicts:

	src/stores/room-list/RoomListStore.ts

2021-05-07 10:40:07 +01:00

..

structures

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

2021-05-07 10:40:07 +01:00

views

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

2021-05-07 10:40:07 +01:00