summaryrefslogtreecommitdiffstats
path: root/webapp/package.json
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-07-10 13:58:01 -0400
committerSaturnino Abril <saturnino.abril@gmail.com>2017-07-11 01:58:01 +0800
commit45e7ad0c3428b4a050fedb354048f8a66aedf2a0 (patch)
tree5c98dab8975a7efc8b7bbb4785e4bdd8b30455d1 /webapp/package.json
parent9a7453e20853c9fe347a17524e58a183afffcab8 (diff)
downloadchat-45e7ad0c3428b4a050fedb354048f8a66aedf2a0.tar.gz
chat-45e7ad0c3428b4a050fedb354048f8a66aedf2a0.tar.bz2
chat-45e7ad0c3428b4a050fedb354048f8a66aedf2a0.zip
Fix out of order posts for admins plus two minor fixes (#6886)
Diffstat (limited to 'webapp/package.json')
-rw-r--r--webapp/package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/package.json b/webapp/package.json
index ac9febbf3..9e1dd4dcb 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -24,7 +24,7 @@
"localforage": "1.5.0",
"marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317",
"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",