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

This commit is contained in:
Weblate 2017-09-07 13:35:39 +00:00
commit 942021e4bb

View File

@ -104,7 +104,8 @@ var RoomSubList = React.createClass({
getDefaultProps: function() { getDefaultProps: function() {
return { return {
onHeaderClick: function() {}, // NOP onHeaderClick: function() {}, // NOP
onShowMoreRooms: function() {} // NOP onShowMoreRooms: function() {}, // NOP
isInvite: false,
}; };
}, },