Kegan Dougal 0210670e91 Merge branch 'develop' into kegan/vector-references ...

Conflicts:
	src/component-index.js

2015-12-02 09:37:28 +00:00

..

components

Merge branch 'develop' into kegan/vector-references

2015-12-01 18:31:13 +00:00

skins/vector

stop clobbering our font colours

2015-12-01 21:44:22 +00:00

vector

Merge branch 'develop' into skindex-nextgen

2015-12-01 18:10:57 +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

VectorConferenceHandler.js

Move MatrixChat to react-sdk. Move all login stuff to react SDK.

2015-11-30 18:10:09 +00:00