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

2017-05-23 15:16:31 +01:00 · 2017-05-23 15:16:31 +01:00 · d419c42a4f
commit d419c42a4f
parent 46bb29a3af
73 changed files with 4660 additions and 639 deletions
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@ -43,9 +43,6 @@ export default React.createClass({

    getDefaultProps: function() {
        return {
-            title: "Error",
-            description: "An error has occurred.",
-            button: "OK",
            focus: true,
        };
    },