Merge branch 'develop' into matthew/twemoji

2019-05-20 16:38:44 +01:00
parent e764ba4890 db73e641ea
commit d3f06763b3
17 changed files with 236 additions and 60 deletions
@@ -473,8 +473,8 @@ export function bodyToHtml(content, highlights, opts={}) {
    });

    return isDisplayedWithHtml ?
-        <span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" /> :
-        <span className={className} dir="auto">{ strippedBody }</span>;
+        <span key="body" className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" /> :
+        <span key="body" className={className} dir="auto">{ strippedBody }</span>;
 }

 /**