summaryrefslogtreecommitdiffstats
path: root/webapp/package.json
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-05-24 10:12:02 -0400
committerCorey Hulen <corey@hulen.com>2016-05-24 07:12:02 -0700
commit3b5a5110c72d7eb2c94d9f428145383b15bd0e4e (patch)
tree68fc1cae0a937b1a0cb0217500af19c7ddb10026 /webapp/package.json
parent7e2b539de484ac4f2e97eafce6b8d63ffa2caf13 (diff)
downloadchat-3b5a5110c72d7eb2c94d9f428145383b15bd0e4e.tar.gz
chat-3b5a5110c72d7eb2c94d9f428145383b15bd0e4e.tar.bz2
chat-3b5a5110c72d7eb2c94d9f428145383b15bd0e4e.zip
Revert "Updated our fork of marked and added more links to test-links.md (#3047)" (#3090)
This reverts commit c868620693c69e2931c3023460eaafd9f6d330b6.
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 df699b773..ccc88c18c 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#43e7e590944ea308a4d36f21917118d51a261e74",
+ "marked": "mattermost/marked#cb85e5cc81bc7937dbb73c3c53d9532b1b97e3ca",
"match-at": "0.1.0",
"mattermost": "mattermost/mattermost-javascript#master",
"object-assign": "4.1.0",