summaryrefslogtreecommitdiffstats
path: root/webapp/package.json
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-19 08:38:50 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-05-19 08:38:50 -0400
commitc868620693c69e2931c3023460eaafd9f6d330b6 (patch)
tree4fdea8445e794d9dc8223d70fa9838d588d20127 /webapp/package.json
parent5ace856e72b23920d9448d4eb11e0bc4ccbf11f0 (diff)
downloadchat-c868620693c69e2931c3023460eaafd9f6d330b6.tar.gz
chat-c868620693c69e2931c3023460eaafd9f6d330b6.tar.bz2
chat-c868620693c69e2931c3023460eaafd9f6d330b6.zip
Updated our fork of marked and added more links to test-links.md (#3047)
Diffstat (limited to 'webapp/package.json')
-rw-r--r--webapp/package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/package.json b/webapp/package.json
index aa961eb87..380c01a34 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -16,7 +16,7 @@
"jasny-bootstrap": "3.1.3",
"jquery": "2.2.3",
"keymirror": "0.1.1",
- "marked": "mattermost/marked#cb85e5cc81bc7937dbb73c3c53d9532b1b97e3ca",
+ "marked": "mattermost/marked#43e7e590944ea308a4d36f21917118d51a261e74",
"mattermost": "mattermost/mattermost-javascript#master",
"match-at": "0.1.0",
"object-assign": "4.1.0",