Michael Telatynski a74470aff0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/desync ... Conflicts: src/components/views/rooms/RoomTile.tsx		2020-07-27 14:42:26 +01:00
..
structures	Add more statements to avoid layout changes	2020-07-21 20:56:07 -06:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/desync	2020-07-27 14:42:26 +01:00