Michael Telatynski 69852ecef4 Merge branches 'develop' and 't3chguy/room-list/123' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/123 ...

 Conflicts:

	src/components/views/rooms/RoomSublist2.tsx

2020-07-07 14:10:58 +01:00

..

strings

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

2020-07-07 14:10:58 +01:00