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

This commit is contained in:
Weblate 2017-10-15 00:14:00 +00:00
commit 2f9e3104de

View file

@ -80,10 +80,10 @@ module.exports = React.createClass({
<MemberAvatar member={sender} width={avatarSize} height={avatarSize} /> <MemberAvatar member={sender} width={avatarSize} height={avatarSize} />
<span className="mx_PinnedEventTile_sender"> <span className="mx_PinnedEventTile_sender">
{sender.name} { sender.name }
</span> </span>
<MessageEvent mxEvent={this.props.mxEvent} className="mx_PinnedEventTile_body" /> <MessageEvent mxEvent={this.props.mxEvent} className="mx_PinnedEventTile_body" />
</div> </div>
); );
} },
}); });