From b8b322c04b93358ace06d2687d340e45a0fe15a8 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Wed, 20 Jul 2016 17:01:52 -0400
Subject: 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
---
 webapp/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webapp')

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",
-- 
cgit v1.2.3-1-g7c22