Merge branch 'develop' into skindex-nextgen

2015-12-01 18:10:57 +00:00
parent c281fe785a 819b80d30f
commit a63bf7cb35
18 changed files with 8 additions and 144 deletions
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -153,7 +153,7 @@ function loadApp() {
    else {
        console.error("Browser is missing required features.");
        // take to a different landing page to AWOOOOOGA at the user
-        var CompatibilityPage = require("../skins/vector/views/pages/CompatibilityPage");
+        var CompatibilityPage = sdk.getComponent("structures.CompatibilityPage");
        window.matrixChat = ReactDOM.render(
            <CompatibilityPage onAccept={function() {
                validBrowser = true;