diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
| commit | 97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80 (patch) | |
| tree | ec2d68077dd2b12de3173871622f3ec2a2b61d35 /webapp/package.json | |
| parent | 21a3219b9b1df033635631afa751742bd4c56ea0 (diff) | |
| parent | a350f4dc0754e1aeabb64bd712ce05f7c59cfa60 (diff) | |
| download | chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.gz chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.bz2 chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.zip | |
Merge branch 'release-4.0'
Diffstat (limited to 'webapp/package.json')
| -rw-r--r-- | webapp/package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/package.json b/webapp/package.json index 7b17d0b1d..c083b80f4 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -23,9 +23,9 @@ "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-master", + "mattermost-redux": "mattermost/mattermost-redux#webapp-4.0", "object-assign": "4.1.1", "pdfjs-dist": "1.8.474", "perfect-scrollbar": "0.7.1", |