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

This commit is contained in:
Weblate 2017-11-08 13:35:58 +00:00
commit 02cce94c2b

View file

@ -172,7 +172,9 @@ export default class GroupStore extends EventEmitter {
acceptGroupInvite() { acceptGroupInvite() {
return this._matrixClient.acceptGroupInvite(this.groupId) return this._matrixClient.acceptGroupInvite(this.groupId)
// The user might be able to see more rooms now // The user might be able to see more rooms now
.then(this._fetchRooms.bind(this)); .then(this._fetchRooms.bind(this))
// The user should now appear as a member
.then(this._fetchMembers.bind(this));
} }
addRoomToGroupSummary(roomId, categoryId) { addRoomToGroupSummary(roomId, categoryId) {