Michael Telatynski e6ab18c9ba Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving ... Conflicts: src/components/views/rooms/RoomList.js		2020-01-16 00:31:43 +00:00
..
structures	…
views	Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving	2020-01-16 00:31:43 +00:00
_common.scss	…
_components.scss	…
rethemendex.sh	…