Michael Telatynski 986d56ffdc Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345 ... Conflicts: src/components/views/rooms/RoomSublist2.tsx src/components/views/rooms/RoomTile2.tsx		2020-07-07 17:11:04 +01:00
..
structures	…
views	Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345	2020-07-07 17:11:04 +01:00
_common.scss	…
_components.scss	…
_font-sizes.scss	…
rethemendex.sh	…