matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

Merge branch 'develop' into expand-codeblock

Browse Source
This commit is contained in:
Šimon Brandner
2021-01-18 17:54:06 +01:00
parent 49dce58027 83fb698bbc
commit 8a4af2f348
23 changed files with 382 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/messages/TextualBody.js
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) {