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

2017-09-07 13:35:39 +00:00
parent 7a62b058c9 ff8527c819
commit 942021e4bb
1 changed files with 2 additions and 1 deletions
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -104,7 +104,8 @@ var RoomSubList = React.createClass({
    getDefaultProps: function() {
        return {
            onHeaderClick: function() {}, // NOP
-            onShowMoreRooms: function() {} // NOP
+            onShowMoreRooms: function() {}, // NOP
+            isInvite: false,
        };
    },