David Baker 2d917910da Merge pull request #556 from vector-im/notif_sync ... Use unread count for room highlight state		2016-01-21 10:31:46 +00:00
..
components	Merge pull request #556 from vector-im/notif_sync	2016-01-21 10:31:46 +00:00
skins/vector	make CSS work on FF	2016-01-21 00:39: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