diff options
| author | nickago <ngonella@calpoly.edu> | 2015-07-09 13:44:28 -0700 |
|---|---|---|
| committer | nickago <ngonella@calpoly.edu> | 2015-07-09 13:44:28 -0700 |
| commit | 04b80b6a25cddce0a44da1409ddc430bc8e797f5 (patch) | |
| tree | 90d57d50ec325e6b4f26608d4c3c20e1e21ce11e /web/react/stores | |
| parent | 38532013fa7e9b152d3750d73c149ff727881342 (diff) | |
| parent | 763618ef3613d0af6baea0e1d49abb6641979841 (diff) | |
| download | chat-04b80b6a25cddce0a44da1409ddc430bc8e797f5.tar.gz chat-04b80b6a25cddce0a44da1409ddc430bc8e797f5.tar.bz2 chat-04b80b6a25cddce0a44da1409ddc430bc8e797f5.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into MM-831
merge
Diffstat (limited to 'web/react/stores')
| -rw-r--r-- | web/react/stores/channel_store.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx index 77ab69ef8..340ce9922 100644 --- a/web/react/stores/channel_store.jsx +++ b/web/react/stores/channel_store.jsx @@ -202,7 +202,7 @@ var ChannelStore = assign({}, EventEmitter.prototype, { BrowserStore.setItem("more_channels", JSON.stringify(channels)); }, _getMoreChannels: function() { - var channels = []; + var channels; try { channels = JSON.parse(BrowserStore.getItem("more_channels")); } |