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

This commit is contained in:
Weblate 2018-05-05 22:25:58 +00:00
commit 67b29bb02f

View file

@ -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;