Michael Telatynski 404009c8cb Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3 ...

 Conflicts:

	src/components/structures/ContextMenu.tsx

	src/components/views/rooms/RoomSublist2.tsx

2020-07-02 23:46:12 +01:00

..

structures

Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3

2020-07-02 23:46:12 +01:00

views

Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3

2020-07-02 23:46:12 +01:00