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/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -46,12 +46,6 @@ export default React.createClass({
        title: React.PropTypes.string,
    },

-    getDefaultProps: function() {
-        return {
-            title: "Authentication",
-        };
-    },
-
    getInitialState: function() {
        return {
            authError: null,