diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-08-10 12:41:59 -0400 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-11 00:41:59 +0800 |
| commit | 3ff4719d4658bd9fd0627459bb976675e3841e83 (patch) | |
| tree | 173a1c4b53fb4dd4ffaba4eea804e2624ea807ec | |
| parent | 6ba6431548e34146dbc103443d66f9b550ae40d8 (diff) | |
| download | chat-3ff4719d4658bd9fd0627459bb976675e3841e83.tar.gz chat-3ff4719d4658bd9fd0627459bb976675e3841e83.tar.bz2 chat-3ff4719d4658bd9fd0627459bb976675e3841e83.zip | |
Update mattermost-redux to webapp-4.1 branch (#7170)
| -rw-r--r-- | webapp/package.json | 2 | ||||
| -rw-r--r-- | webapp/yarn.lock | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webapp/package.json b/webapp/package.json index 7d909f9ba..a3dd87b58 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -25,7 +25,7 @@ "localforage": "1.5.0", "marked": "mattermost/marked#9f0c8b96fd5efedb99f5fc45cca9ac7684b5aa69", "match-at": "0.1.0", - "mattermost-redux": "mattermost/mattermost-redux#master", + "mattermost-redux": "mattermost/mattermost-redux#webapp-4.1", "object-assign": "4.1.1", "pdfjs-dist": "1.8.557", "perfect-scrollbar": "0.7.1", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index ff190aedc..1fadfcc05 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -5002,9 +5002,9 @@ 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#master: +mattermost-redux@mattermost/mattermost-redux#webapp-4.1: version "0.0.1" - resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/e5297912f528b822b61c61a36735fb4d6699d08d" + resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/31bb5c2f21b504c4b7cab6624e4884bd3fc9f294" dependencies: deep-equal "1.0.1" harmony-reflect "1.5.1" |