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

This commit is contained in:
Weblate 2017-09-21 16:31:14 +00:00
commit 406f36a2d1
1 changed files with 1 additions and 1 deletions

View File

@ -103,7 +103,7 @@ module.exports = React.createClass({
if (this.state.phase === this.Phase.GroupMemberList) { if (this.state.phase === this.Phase.GroupMemberList) {
showGroupInviteDialog(this.props.groupId); showGroupInviteDialog(this.props.groupId);
} else { } else {
// call UserPickerDialog // call AddressPickerDialog
dis.dispatch({ dis.dispatch({
action: 'view_invite', action: 'view_invite',
roomId: this.props.roomId, roomId: this.props.roomId,