diff options
| author | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
| commit | 9d109b070037951fcd0832b785eba8a3db9a157c (patch) | |
| tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/package.json | |
| parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
| parent | a21a06afd9907e9911dcb166d902cba9f405c7cb (diff) | |
| download | chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.gz chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.bz2 chat-9d109b070037951fcd0832b785eba8a3db9a157c.zip | |
Merge branch 'release-3.9' into merge-3.9
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 e7203f0d6..8d64773a9 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -22,7 +22,7 @@ "localforage": "1.5.0", "marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317", "match-at": "0.1.0", - "mattermost-redux": "mattermost/mattermost-redux#webapp-part4", + "mattermost-redux": "mattermost/mattermost-redux#webapp-3.9", "object-assign": "4.1.1", "pdfjs-dist": "1.7.363", "perfect-scrollbar": "0.6.16", |