Merge branch 'develop' into expand-codeblock

This commit is contained in:
Šimon Brandner 2021-01-18 17:54:06 +01:00
commit 8a4af2f348
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
23 changed files with 382 additions and 172 deletions

View file

@ -412,7 +412,10 @@ export default class TextualBody extends React.Component {
ref: this._content,
});
if (this.props.replacingEventId) {
body = [body, this._renderEditedMarker()];
body = <>
{body}
{this._renderEditedMarker()}
</>;
}
if (this.props.highlightLink) {