Merge branch 'develop' into require-css

2015-12-02 10:26:26 +00:00
parent 7ff5e42f3e 6db1151699
commit 939733b736
12 changed files with 183 additions and 102 deletions
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -27,7 +27,7 @@ var RunModernizrTests = require("./modernizr"); // this side-effects a global
 var React = require("react");
 var ReactDOM = require("react-dom");
 var sdk = require("matrix-react-sdk");
-sdk.loadSkin(require('../skins/vector/skindex'));
+sdk.loadSkin(require('../component-index'));
 var VectorConferenceHandler = require('../VectorConferenceHandler');
 var configJson = require("../../config.json");