Michael Telatynski a1908a208e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list ...

 Conflicts:

	src/components/views/rooms/RoomList.js

	src/stores/RoomListStore.js

2020-02-26 23:02:06 +00:00

..

structures

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

2020-02-26 23:02:06 +00:00

views

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

2020-02-26 23:02:06 +00:00