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

Conflicts: package.json
2020-01-05 22:23:03 +00:00
parent 378a82e6fb 449efec1a1
commit 4bea87f00d
31 changed files with 560 additions and 157 deletions
@@ -82,6 +82,7 @@
    "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",
    "linkifyjs": "^2.1.6",