Merge remote-tracking branch 'origin/develop' into travis/settings-cleanup-1

2019-02-25 10:44:33 -07:00
parent 5bf9f721c8 a26b62ef94
commit cdf09300ac
1 changed files with 1 additions and 1 deletions
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
    "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
    "gfm.css": "^1.1.1",
    "glob": "^5.0.14",
-    "highlight.js": "^9.13.0",
+    "highlight.js": "9.14.2",
    "is-ip": "^2.0.0",
    "isomorphic-fetch": "^2.2.1",
    "linkifyjs": "^2.1.6",