Luke Barnard 1f3ab4425a Merge branch 'develop' into matthew/homepages ... Conflicts: src/component-index.js src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss		2017-02-01 11:34:24 +00:00
..
structures	Merge branch 'develop' into matthew/homepages	2017-02-01 11:34:24 +00:00
views	Replace inline styles for logos with css	2017-01-27 16:30:44 +00:00