Merge remote-tracking branch 'origin/develop' into develop

2017-09-14 09:38:30 +00:00
parent c890eea88a bb8538cd1a
commit 5a2c74a893
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -56,7 +56,7 @@ module.exports = React.createClass({
            editing: false,
            inRoom: false,
            onSaveClick: function() {},
-            onCancelClick: function() {},
+            onCancelClick: null,
        };
    },