diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-05-30 07:57:44 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-30 07:57:44 -0400 |
| commit | fe5db123744c380bdddb36f196dd6cf7518d41cf (patch) | |
| tree | d632ef9a576b1c6df54bc92c7f016e0f83bae7b8 /webapp/package.json | |
| parent | e1bebb2d776b12d6e1461e06f318e79fcb93ea2c (diff) | |
| download | chat-fe5db123744c380bdddb36f196dd6cf7518d41cf.tar.gz chat-fe5db123744c380bdddb36f196dd6cf7518d41cf.tar.bz2 chat-fe5db123744c380bdddb36f196dd6cf7518d41cf.zip | |
PLT-3080 Added ability to disable formatting for debugging and updated marked to fix errors (#3141)
* Removed injectIntl from user_settings_advanced.jsx
* Added setting to disable formatting for debugging
* Updated fork of marked
Diffstat (limited to 'webapp/package.json')
| -rw-r--r-- | webapp/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/package.json b/webapp/package.json index deecbc1a8..8e2063c84 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#a16c38a3c7cdaaefc33922812b42bdf8bcfaa127", + "marked": "mattermost/marked#2d92082cd542dc0adc175a1407194f6a4c3cb621", "match-at": "0.1.0", "mattermost": "mattermost/mattermost-javascript#master", "match-at": "0.1.0", |