Kegan Dougal 317e1fb9cd Merge branch 'develop' into kegan/invite-search		2016-01-18 17:33:26 +00:00
..
components	PushRules settings: Applied review remarks (2/2)	2016-01-18 18:24:53 +01:00
skins/vector	Merge branch 'develop' into kegan/invite-search	2016-01-18 17:33:26 +00:00
vector	Merge branch 'develop' into matthew/roomsettings2	2016-01-13 17:33:32 +00:00
component-index.js	PushRules settings: Added a dedicated component to display them	2016-01-11 17:24:04 +01:00
header	copyrights for 2016	2016-01-07 04:17:56 +00:00
VectorConferenceHandler.js	copyrights for 2016	2016-01-07 04:17:56 +00:00