Merge branch 'develop' into expand-codeblock

2021-01-18 17:54:06 +01:00
parent 49dce58027 83fb698bbc
commit 8a4af2f348
23 changed files with 382 additions and 172 deletions
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -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) {