Merge branch 'develop' into skindex-nextgen

This commit is contained in:
David Baker 2015-12-01 18:10:57 +00:00
commit a63bf7cb35
18 changed files with 8 additions and 144 deletions

View file

@ -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;