diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-08-17 09:35:36 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-08-17 09:35:36 -0700 |
| commit | fd1301779fecc2910a9fdcf93af52ff33a4349ba (patch) | |
| tree | ccd8b35d347b77c8c6a99db9422b3dbc0ff3bd2d /webapp/package.json | |
| parent | d41f1695e99a81808f5dc1fbe7820062947b5291 (diff) | |
| parent | 0033e3e37b12cb5d951d21492500d66a6abc472b (diff) | |
| download | chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.gz chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.bz2 chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.zip | |
Merge branch 'release-4.1'
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 1911bd2cb..04a73d58a 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -25,7 +25,7 @@ "localforage": "1.5.0", "marked": "mattermost/marked#5194fc037b35036910c6542b04bb471fe56b27a9", "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", |