diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-16 09:11:24 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-05-16 09:11:24 -0400 |
| commit | 9ffc1da55607d3d167947d0761407119ea314b3a (patch) | |
| tree | 5a7b8845607d7c7dd31c22131b3d96897de6babb /webapp | |
| parent | 0a20e8d3269515e2d44a0bcad0a2408f62245814 (diff) | |
| download | chat-9ffc1da55607d3d167947d0761407119ea314b3a.tar.gz chat-9ffc1da55607d3d167947d0761407119ea314b3a.tar.bz2 chat-9ffc1da55607d3d167947d0761407119ea314b3a.zip | |
Point webapp at redux webapp-master branch (#6415)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/package.json | 2 | ||||
| -rw-r--r-- | webapp/store/index.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/package.json b/webapp/package.json index 8d64773a9..44f1d9386 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-3.9", + "mattermost-redux": "mattermost/mattermost-redux#webapp-master", "object-assign": "4.1.1", "pdfjs-dist": "1.7.363", "perfect-scrollbar": "0.6.16", diff --git a/webapp/store/index.js b/webapp/store/index.js index 521181f8c..7ab22e292 100644 --- a/webapp/store/index.js +++ b/webapp/store/index.js @@ -107,6 +107,6 @@ export default function configureStore(initialState) { } }; - return configureServiceStore({}, {}, offlineOptions); + return configureServiceStore({}, {}, offlineOptions, null, false); } |