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

2018-06-08 16:36:48 +00:00
parent 13675b258d 50e08c7560
commit 6172196495
1 changed files with 1 additions and 0 deletions
@@ -675,6 +675,7 @@ module.exports = React.createClass({
        }
        this._updateRoomMembers();
        this._checkIfAlone(this.state.room);
    },
    onRoomMemberMembership: function(ev, member, oldMembership) {