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

2017-09-14 23:09:26 +01:00
parent 1f837d2ae1 94ec11d3e1
commit f3a4856593
3 changed files with 3 additions and 2 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,
        };
    },