Merge branch 'develop' into require-css
This commit is contained in:
commit
939733b736
12 changed files with 183 additions and 102 deletions
|
@ -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");
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue