diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
| commit | 323ce8b203c570ed6a1dd57b44d6637ad8207616 (patch) | |
| tree | efc3c61b905244bdb0e1ace0ce9f5ae4876644ad /webapp/components/sidebar.jsx | |
| parent | d1207d34c1d99eba9ebf85c98d267ee7e955ea7d (diff) | |
| parent | b55ec6148caa93d54b660afe55408c643d217108 (diff) | |
| download | chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.gz chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.bz2 chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.zip | |
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/components/sidebar.jsx')
| -rw-r--r-- | webapp/components/sidebar.jsx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index 626ac2866..5c6645833 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -19,7 +19,6 @@ import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; import * as ChannelUtils from 'utils/channel_utils.jsx'; import * as ChannelActions from 'actions/channel_actions.jsx'; -import {loadProfilesAndTeamMembersForDMSidebar} from 'actions/user_actions.jsx'; import Constants from 'utils/constants.jsx'; @@ -125,9 +124,6 @@ export default class Sidebar extends React.Component { document.addEventListener('keydown', this.navigateChannelShortcut); document.addEventListener('keydown', this.navigateUnreadChannelShortcut); - - loadProfilesAndTeamMembersForDMSidebar(); - AsyncClient.getMyChannelMembers(); } shouldComponentUpdate(nextProps, nextState) { |