diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-17 09:37:16 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-17 09:37:16 -0400 |
commit | 738e53af95fd712e682fae0cad7af0b47b733acf (patch) | |
tree | f0a5c49824012823c855a301a8fdca27c32ca0d8 /web/react/components/user_settings_modal.jsx | |
parent | 2fbc92af108316c0952e4509f5e7a2a9d3305045 (diff) | |
parent | 156682e3dec71f672118a04377aa5a367f00c4ee (diff) | |
download | chat-738e53af95fd712e682fae0cad7af0b47b733acf.tar.gz chat-738e53af95fd712e682fae0cad7af0b47b733acf.tar.bz2 chat-738e53af95fd712e682fae0cad7af0b47b733acf.zip |
Merge pull request #369 from nickago/MM-1703
MM 1703 Closing access history or activity log returns user to security menu
Diffstat (limited to 'web/react/components/user_settings_modal.jsx')
-rw-r--r-- | web/react/components/user_settings_modal.jsx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/web/react/components/user_settings_modal.jsx b/web/react/components/user_settings_modal.jsx index 702e7ad7a..7181c4020 100644 --- a/web/react/components/user_settings_modal.jsx +++ b/web/react/components/user_settings_modal.jsx @@ -32,7 +32,7 @@ module.exports = React.createClass({ tabs.push({name: "appearance", ui_name: "Appearance", icon: "glyphicon glyphicon-wrench"}); return ( - <div className="modal fade" ref="modal" id="user_settings1" role="dialog" tabIndex="-1" aria-hidden="true"> + <div className="modal fade" ref="modal" id="user_settings" role="dialog" tabIndex="-1" aria-hidden="true"> <div className="modal-dialog settings-modal"> <div className="modal-content"> <div className="modal-header"> @@ -64,4 +64,3 @@ module.exports = React.createClass({ ); } }); - |