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

2017-11-03 18:47:03 +00:00 · 2017-11-03 18:47:03 +00:00 · 295bdae075
parent ed586bedbc d03f2826c3
commit 295bdae075
1 changed files with 1 additions and 0 deletions
--- a/src/components/views/rooms/RoomDetailList.js
+++ b/src/components/views/rooms/RoomDetailList.js
@ -49,6 +49,7 @@ const RoomDetailRow = React.createClass({
        dis.dispatch({
            action: 'view_room',
            room_id: this.props.room.roomId,
+            room_alias: this.props.room.canonicalAlias || (this.props.room.aliases || [])[0],
        });
    },