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

This commit is contained in:
Weblate 2018-05-05 23:22:23 +00:00
commit 8fbc87b6cf

View File

@ -177,6 +177,7 @@ module.exports = React.createClass({
render: function() {
const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
/*eslint no-unused-vars: ["error", { "ignoreRestSiblings": true }]*/
const {room, oobData, viewAvatarOnClick, ...otherProps} = this.props;
const roomName = room ? room.name : oobData.name;