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

This commit is contained in:
Weblate 2017-11-03 18:47:03 +00:00
commit 295bdae075

View File

@ -49,6 +49,7 @@ const RoomDetailRow = React.createClass({
dis.dispatch({ dis.dispatch({
action: 'view_room', action: 'view_room',
room_id: this.props.room.roomId, room_id: this.props.room.roomId,
room_alias: this.props.room.canonicalAlias || (this.props.room.aliases || [])[0],
}); });
}, },