diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-11-20 09:22:16 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-11-20 09:22:16 -0500 |
commit | 25bc02c785167370b0e2e04ee04f305a801078c4 (patch) | |
tree | 00a8e7c9821fc8d8669fd7a908b3f70e3089c95a /web/react/components/user_settings/user_settings.jsx | |
parent | 3aea449b524f7bbc9bae92309fb702e04c1bf01e (diff) | |
parent | 34097faa13dab6ea5d7ac992842126c17ad4d2b9 (diff) | |
download | chat-25bc02c785167370b0e2e04ee04f305a801078c4.tar.gz chat-25bc02c785167370b0e2e04ee04f305a801078c4.tar.bz2 chat-25bc02c785167370b0e2e04ee04f305a801078c4.zip |
Merge pull request #1478 from mattermost/plt-1237
PLT-1237 Upgrading dependancies
Diffstat (limited to 'web/react/components/user_settings/user_settings.jsx')
-rw-r--r-- | web/react/components/user_settings/user_settings.jsx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/web/react/components/user_settings/user_settings.jsx b/web/react/components/user_settings/user_settings.jsx index 40825ba93..54d98bbde 100644 --- a/web/react/components/user_settings/user_settings.jsx +++ b/web/react/components/user_settings/user_settings.jsx @@ -1,16 +1,16 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserStore = require('../../stores/user_store.jsx'); -var utils = require('../../utils/utils.jsx'); -var NotificationsTab = require('./user_settings_notifications.jsx'); -var SecurityTab = require('./user_settings_security.jsx'); -var GeneralTab = require('./user_settings_general.jsx'); -var AppearanceTab = require('./user_settings_appearance.jsx'); -var DeveloperTab = require('./user_settings_developer.jsx'); -var IntegrationsTab = require('./user_settings_integrations.jsx'); -var DisplayTab = require('./user_settings_display.jsx'); -var AdvancedTab = require('./user_settings_advanced.jsx'); +import UserStore from '../../stores/user_store.jsx'; +import * as utils from '../../utils/utils.jsx'; +import NotificationsTab from './user_settings_notifications.jsx'; +import SecurityTab from './user_settings_security.jsx'; +import GeneralTab from './user_settings_general.jsx'; +import AppearanceTab from './user_settings_appearance.jsx'; +import DeveloperTab from './user_settings_developer.jsx'; +import IntegrationsTab from './user_settings_integrations.jsx'; +import DisplayTab from './user_settings_display.jsx'; +import AdvancedTab from './user_settings_advanced.jsx'; export default class UserSettings extends React.Component { constructor(props) { |