summaryrefslogtreecommitdiffstats
path: root/webapp/package.json
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-07-20 17:01:52 -0400
committerCorey Hulen <corey@hulen.com>2016-07-20 13:01:52 -0800
commitb8b322c04b93358ace06d2687d340e45a0fe15a8 (patch)
tree8951d1f0b69a3e4581168c3831ec355ee1bd7c55 /webapp/package.json
parent537d647846e596e3cc6a8d7973b94c4448924a0b (diff)
downloadchat-b8b322c04b93358ace06d2687d340e45a0fe15a8.tar.gz
chat-b8b322c04b93358ace06d2687d340e45a0fe15a8.tar.bz2
chat-b8b322c04b93358ace06d2687d340e45a0fe15a8.zip
PLT-3482/PLT-3551/PLT-3552 Fixed some markdown list parsing (#3637)
* PLT-3552 Partially-fixed an invalid test case * PLT-3551 Removed an invalid test case * PLT-3482 Added a test case for multiple lists separated by text * PLT-3482 Updated marked to fix multiple lists separated by text
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 3c7be4a48..651c287ef 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -16,7 +16,7 @@
"jasny-bootstrap": "3.1.3",
"jquery": "3.1.0",
"keymirror": "0.1.1",
- "marked": "mattermost/marked#bbba29c38ea5b498561202abc376998d84e746db",
+ "marked": "mattermost/marked#69736482dbad685c398a5eec33a59b5ab06057ac",
"match-at": "0.1.0",
"object-assign": "4.1.0",
"perfect-scrollbar": "0.6.12",