Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801

2017-05-23 15:16:31 +01:00
parent 46bb29a3af
commit d419c42a4f
73 changed files with 4660 additions and 639 deletions
--- a/src/components/views/dialogs/NeedToRegisterDialog.js
+++ b/src/components/views/dialogs/NeedToRegisterDialog.js
@@ -38,13 +38,6 @@ module.exports = React.createClass({
        onFinished: React.PropTypes.func.isRequired,
    },

-    getDefaultProps: function() {
-        return {
-            title: "Registration required",
-            description: "A registered account is required for this action",
-        };
-    },
-
    onRegisterClicked: function() {
        dis.dispatch({
            action: "start_upgrade_registration",