summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-02-02 18:22:42 -0500
committerJoram Wilander <jwawilander@gmail.com>2017-02-02 18:22:42 -0500
commit24f02a15c14d5890c1914933e1638b920788e496 (patch)
tree98c55f800a1880630681aaa6e2ef230f89dd751d /webapp
parentbce2eb6cebb6b853cade0d943ce1e3726dfcdf31 (diff)
downloadchat-24f02a15c14d5890c1914933e1638b920788e496.tar.gz
chat-24f02a15c14d5890c1914933e1638b920788e496.tar.bz2
chat-24f02a15c14d5890c1914933e1638b920788e496.zip
Updated marked to allow escaping pipe characters and to restrict reference links (#5278)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/package.json b/webapp/package.json
index e9a174798..3ead69c20 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -16,7 +16,7 @@
"intl": "1.2.5",
"jasny-bootstrap": "3.1.3",
"jquery": "3.1.1",
- "marked": "mattermost/marked#1adb66d8df3d582f4434e8e6cd401715463643d9",
+ "marked": "mattermost/marked#328857681dcc98a3d75633d6c0effa7c29b6cceb",
"match-at": "0.1.0",
"object-assign": "4.1.0",
"pdfjs-dist": "1.6.319",