diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-07-14 13:47:13 -0400 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-15 01:47:13 +0800 |
| commit | 22d34476e5d8d98baeec506f24e78ea0ff8932b9 (patch) | |
| tree | c9237e9e88cd6414ce75272dcaf8470474c65111 /webapp | |
| parent | 3ad3aa653f1bba0b8051782bf7a7bb03a7519c82 (diff) | |
| download | chat-22d34476e5d8d98baeec506f24e78ea0ff8932b9.tar.gz chat-22d34476e5d8d98baeec506f24e78ea0ff8932b9.tar.bz2 chat-22d34476e5d8d98baeec506f24e78ea0ff8932b9.zip | |
PLT-7133 Updated marked to fix escaping of autolinked email addresses (#6942)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/package.json | 2 | ||||
| -rw-r--r-- | webapp/yarn.lock | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webapp/package.json b/webapp/package.json index 9e1dd4dcb..4870c5ce8 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -22,7 +22,7 @@ "jquery": "3.2.1", "key-mirror": "1.0.1", "localforage": "1.5.0", - "marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317", + "marked": "mattermost/marked#c0b5f4a651b0af63e974522b20b93b7999490c53", "match-at": "0.1.0", "mattermost-redux": "mattermost/mattermost-redux#webapp-4.0", "object-assign": "4.1.1", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 0192200f8..4bde0079e 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -5025,9 +5025,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#8f5902fff9bad793cd6c66e0c44002c9e79e1317: +marked@mattermost/marked#c0b5f4a651b0af63e974522b20b93b7999490c53: version "0.3.5" - resolved "https://codeload.github.com/mattermost/marked/tar.gz/8f5902fff9bad793cd6c66e0c44002c9e79e1317" + resolved "https://codeload.github.com/mattermost/marked/tar.gz/c0b5f4a651b0af63e974522b20b93b7999490c53" match-at@0.1.0: version "0.1.0" |