diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-16 09:12:30 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-16 09:12:30 -0700 |
| commit | 8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73 (patch) | |
| tree | 84e426d92eccf017f0fd5ccd22815a2139bd6e44 /web/react/components/user_settings/user_settings_modal.jsx | |
| parent | 6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2 (diff) | |
| parent | 9c045f0d4bdf254f57b94356fd2f5f2a2408ed03 (diff) | |
| download | chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.gz chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.bz2 chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.zip | |
Fixing merge
Diffstat (limited to 'web/react/components/user_settings/user_settings_modal.jsx')
| -rw-r--r-- | web/react/components/user_settings/user_settings_modal.jsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx index fbb003fd5..4296d7909 100644 --- a/web/react/components/user_settings/user_settings_modal.jsx +++ b/web/react/components/user_settings/user_settings_modal.jsx @@ -41,6 +41,7 @@ export default class UserSettingsModal extends React.Component { if (global.window.mm_config.EnableIncomingWebhooks === 'true') { tabs.push({name: 'integrations', uiName: 'Integrations', icon: 'glyphicon glyphicon-transfer'}); } + tabs.push({name: 'display', uiName: 'Display', icon: 'glyphicon glyphicon-eye-open'}); return ( <div |