summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-06 21:03:20 -0400
committerGitHub <noreply@github.com>2017-06-06 21:03:20 -0400
commit4d7c54baa1358231c16778c55b6f14629817b72d (patch)
tree84ed2dc9cb9007255881e6eb0b320fa16db65636 /webapp
parent4554d511d57d4181c1d5a67aaa5d1e2092cf105b (diff)
downloadchat-4d7c54baa1358231c16778c55b6f14629817b72d.tar.gz
chat-4d7c54baa1358231c16778c55b6f14629817b72d.tar.bz2
chat-4d7c54baa1358231c16778c55b6f14629817b72d.zip
Point to 3.10 release branch for redux (#6601)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/package.json2
-rw-r--r--webapp/yarn.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/package.json b/webapp/package.json
index dc32b6d2e..6ebb33c20 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-master",
+ "mattermost-redux": "mattermost/mattermost-redux#webapp-3.10",
"object-assign": "4.1.1",
"pdfjs-dist": "1.8.361",
"perfect-scrollbar": "0.7.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 01cba4d16..fe03edcc8 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -4882,7 +4882,7 @@ math-expression-evaluator@^1.2.14:
version "1.2.16"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
-mattermost-redux@mattermost/mattermost-redux#webapp-master:
+mattermost-redux@mattermost/mattermost-redux#webapp-3.10:
version "0.0.1"
resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/30af9bdf41aeac4ca5a37817773bd8a9b8372a4a"
dependencies: