manuroe fdf5b0a4fc Merge branch 'develop' into push-rules-settings ...

# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css

2016-01-18 18:14:20 +01:00

..

components

Merge branch 'develop' into push-rules-settings

2016-01-18 18:14:20 +01:00

skins/vector

Merge branch 'develop' into push-rules-settings

2016-01-18 18:14:20 +01: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