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

2018-05-05 22:25:58 +00:00 · 2018-05-05 22:25:58 +00:00 · 67b29bb02f
parent d421c031fc 500f58a963
commit 67b29bb02f
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@ -177,7 +177,7 @@ module.exports = React.createClass({
    render: function() {
        const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");

-        const {room, oobData, ...otherProps} = this.props;
+        const {room, oobData, viewAvatarOnClick, ...otherProps} = this.props;

        const roomName = room ? room.name : oobData.name;