diff options
author | Asaad Mahmood <asaad@spinpunch.com> | 2015-12-14 19:04:08 +0500 |
---|---|---|
committer | Asaad Mahmood <asaad@spinpunch.com> | 2015-12-14 19:04:08 +0500 |
commit | 3d8d152aa0d84d1150ee0a174641c0a4697307f1 (patch) | |
tree | bdcdc81111fd7c8f2b3dd912402006b2d66b50cf /web/react/components/admin_console/admin_controller.jsx | |
parent | def79636f8e41204c32bf4b628b254aec5377ef5 (diff) | |
parent | b9a4966e7d287ddaa16ccd7d553e2ada13edc289 (diff) | |
download | chat-3d8d152aa0d84d1150ee0a174641c0a4697307f1.tar.gz chat-3d8d152aa0d84d1150ee0a174641c0a4697307f1.tar.bz2 chat-3d8d152aa0d84d1150ee0a174641c0a4697307f1.zip |
Merge branch 'master' of https://github.com/mattermost/platform into code-themes
Diffstat (limited to 'web/react/components/admin_console/admin_controller.jsx')
-rw-r--r-- | web/react/components/admin_console/admin_controller.jsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx index 4f144b0dd..e587c4f84 100644 --- a/web/react/components/admin_console/admin_controller.jsx +++ b/web/react/components/admin_console/admin_controller.jsx @@ -18,6 +18,7 @@ import GitLabSettingsTab from './gitlab_settings.jsx'; import SqlSettingsTab from './sql_settings.jsx'; import TeamSettingsTab from './team_settings.jsx'; import ServiceSettingsTab from './service_settings.jsx'; +import LegalAndSupportSettingsTab from './legal_and_support_settings.jsx'; import TeamUsersTab from './team_users.jsx'; import TeamAnalyticsTab from './team_analytics.jsx'; @@ -148,6 +149,8 @@ export default class AdminController extends React.Component { tab = <TeamSettingsTab config={this.state.config} />; } else if (this.state.selected === 'service_settings') { tab = <ServiceSettingsTab config={this.state.config} />; + } else if (this.state.selected === 'legal_and_support_settings') { + tab = <LegalAndSupportSettingsTab config={this.state.config} />; } else if (this.state.selected === 'team_users') { if (this.state.teams) { tab = <TeamUsersTab team={this.state.teams[this.state.selectedTeam]} />; |