Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody

Conflicts: yarn.lock
2020-01-09 12:17:21 +00:00
parent 8116ac74ce 1d9d706b9c
commit 245a68b3ba
16 changed files with 338 additions and 446 deletions
@@ -81,6 +81,7 @@
    "glob": "^5.0.14",
    "glob-to-regexp": "^0.4.1",
    "highlight.js": "^9.15.8",
+    "html-entities": "^1.2.1",
    "humanize": "^0.0.9",
    "is-ip": "^2.0.0",
    "isomorphic-fetch": "^2.2.1",