Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing

2015-07-21 10:39:46 +01:00
parent af190f286c 3657029fc7
commit 0b1b6057d6
25 changed files with 434 additions and 88 deletions
@@ -200,7 +200,7 @@ module.exports = {
                }, function(err) {
                    console.error("Command failure: %s", err);
                    Modal.createDialog(ErrorDialog, {
-                        title: "Server Error",
+                        title: "Server error",
                        description: err.message
                    });
                });
@@ -208,7 +208,7 @@ module.exports = {
            else if (cmd.error) {
                console.error(cmd.error);
                Modal.createDialog(ErrorDialog, {
-                    title: "Command Error",
+                    title: "Command error",
                    description: cmd.error
                });
            }