Matthew Hodgson a7b9e54594 Merge branch 'develop' into matthew/settings		2015-12-18 00:36:46 +00:00
..
components	escape key to cancel search box	2015-12-11 02:32:30 +00:00
skins/vector	Merge branch 'develop' into matthew/settings	2015-12-18 00:36:46 +00:00
vector	Merge branch 'develop' into require-css	2015-12-02 10:26:26 +00:00
VectorConferenceHandler.js	Pass a userId rather than a RoomMember to isConferenceUser	2015-12-16 11:55:13 +00:00
component-index.js	Merge branch 'develop' into kegan/vector-references	2015-12-02 09:37:28 +00:00
header	Move copyright header	2015-11-30 18:00:54 +00:00