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
..
components	Merge branch 'develop' into matthew/homepages	2017-02-01 11:34:24 +00:00
notifications	RoomNotifs.js moved to react-sdk	2016-08-17 18:29:38 +01:00
skins/vector	Merge branch 'develop' into matthew/homepages	2017-02-01 11:34:24 +00:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	Fix badge spam: attempt 2 (#3073)	2017-01-26 12:58:29 +00:00
component-index.js	Merge branch 'develop' into matthew/homepages	2017-02-01 11:34:24 +00:00
header	copyrights for 2016	2016-01-07 04:17:56 +00:00
VectorConferenceHandler.js	click on group call thumbnail should return you to the group call, not the 1:1	2016-04-12 02:27:35 +01:00