mirror of
https://github.com/vector-im/element-web.git
synced 2025-12-11 12:21:15 +01:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
2f9e3104de
@ -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>
|
||||||
);
|
);
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user