diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-09-09 10:56:48 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-09-09 10:56:48 +0500 |
commit | c7692a800ef43b63866b6f470b72eb1c3816484f (patch) | |
tree | 801314957491080f83789335f64fb979292529d9 /web/react/components/team_settings.jsx | |
parent | 8c9c6de97041f8b2d646a7b4f03852c74e8e8fab (diff) | |
parent | 64d4890a4109618b383f7cfe1acc541bd72a0899 (diff) | |
download | chat-c7692a800ef43b63866b6f470b72eb1c3816484f.tar.gz chat-c7692a800ef43b63866b6f470b72eb1c3816484f.tar.bz2 chat-c7692a800ef43b63866b6f470b72eb1c3816484f.zip |
Merge branch 'master' of https://github.com/mattermost/platform into ui-changes
Diffstat (limited to 'web/react/components/team_settings.jsx')
-rw-r--r-- | web/react/components/team_settings.jsx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/web/react/components/team_settings.jsx b/web/react/components/team_settings.jsx index 53855fe1c..396521af9 100644 --- a/web/react/components/team_settings.jsx +++ b/web/react/components/team_settings.jsx @@ -3,6 +3,7 @@ var TeamStore = require('../stores/team_store.jsx'); var ImportTab = require('./team_import_tab.jsx'); +var ExportTab = require('./team_export_tab.jsx'); var FeatureTab = require('./team_feature_tab.jsx'); var GeneralTab = require('./team_general_tab.jsx'); var Utils = require('../utils/utils.jsx'); @@ -64,6 +65,13 @@ export default class TeamSettings extends React.Component { </div> ); break; + case 'export': + result = ( + <div> + <ExportTab /> + </div> + ); + break; default: result = ( <div/> |