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/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -33,7 +33,6 @@ export default React.createClass({
            title: "",
            description: "",
            extraButtons: null,
-            button: "OK",
            focus: true,
            hasCancelButton: true,
        };