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

..

vector

Merge branch 'develop' into matthew/homepages

2017-02-01 11:34:24 +00:00