Merge branch 'develop' into kegan/vector-references

Update having merged skindexing PR
2015-12-01 18:31:13 +00:00 · 2015-12-01 18:31:13 +00:00 · 95e71a531e
commit 95e71a531e
parent e21d435d84 d2c6e2195e
11 changed files with 66 additions and 105 deletions
--- a/src/components/views/login/VectorCustomServerDialog.js
+++ b/src/components/views/login/VectorCustomServerDialog.js
@ -18,6 +18,9 @@ var React = require("react");

 module.exports = React.createClass({
    displayName: 'VectorCustomServerDialog',
+    statics: {
+        replaces: 'CustomServerDialog',
+    },

    render: function() {
        return (