diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-23 10:53:57 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-23 10:53:57 +0500 |
| commit | cc904a7ec73a44a337908c685bfc311bdbe1ff85 (patch) | |
| tree | 6fb865bb734cad0389490e4add11f2e308fe473c /web/react/components/sidebar.jsx | |
| parent | 79ce0dd914713aac9d2f1332202a48e7e0d338a3 (diff) | |
| parent | 02a6f6b2cd4c0a6bf32b23961557c385039ae2f2 (diff) | |
| download | chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.tar.gz chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.tar.bz2 chat-cc904a7ec73a44a337908c685bfc311bdbe1ff85.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/components/sidebar.jsx')
| -rw-r--r-- | web/react/components/sidebar.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index d1fe37300..ed2c84057 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -183,8 +183,8 @@ export default class Sidebar extends React.Component { const channel = ChannelStore.getCurrent(); if (channel) { let currentSiteName = ''; - if (global.window.config.SiteName != null) { - currentSiteName = global.window.config.SiteName; + if (global.window.mm_config.SiteName != null) { + currentSiteName = global.window.mm_config.SiteName; } let currentChannelName = channel.display_name; |