summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-07-27 17:17:03 -0400
committerGitHub <noreply@github.com>2017-07-27 17:17:03 -0400
commit2d43e9975762b3bd4e6ede6c4db1e16ac661ab87 (patch)
treee4958cfd3a2bdbcf674721fcf010f33bb52ecb13 /webapp
parent67e2715274dcc7869baa8b39f5c8d0baf8ea4bed (diff)
downloadchat-2d43e9975762b3bd4e6ede6c4db1e16ac661ab87.tar.gz
chat-2d43e9975762b3bd4e6ede6c4db1e16ac661ab87.tar.bz2
chat-2d43e9975762b3bd4e6ede6c4db1e16ac661ab87.zip
PLT-7032/PLT-7155 Updated marked to fix empty table cells and code block whitespace (#7015)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/package.json2
-rw-r--r--webapp/yarn.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/webapp/package.json b/webapp/package.json
index 00a85b614..dee85638a 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -23,7 +23,7 @@
"jquery": "3.2.1",
"key-mirror": "1.0.1",
"localforage": "1.5.0",
- "marked": "mattermost/marked#c0b5f4a651b0af63e974522b20b93b7999490c53",
+ "marked": "mattermost/marked#186e3ea2a009979d251ef9fb1ca8b333f27fb11f",
"match-at": "0.1.0",
"mattermost-redux": "mattermost/mattermost-redux#master",
"object-assign": "4.1.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 1b7b28094..50d83248b 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -4986,9 +4986,9 @@ map-obj@^1.0.0, map-obj@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-marked@mattermost/marked#c0b5f4a651b0af63e974522b20b93b7999490c53:
+marked@mattermost/marked#186e3ea2a009979d251ef9fb1ca8b333f27fb11f:
version "0.3.5"
- resolved "https://codeload.github.com/mattermost/marked/tar.gz/c0b5f4a651b0af63e974522b20b93b7999490c53"
+ resolved "https://codeload.github.com/mattermost/marked/tar.gz/186e3ea2a009979d251ef9fb1ca8b333f27fb11f"
match-at@0.1.0:
version "0.1.0"