diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-08-05 15:50:54 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-08-05 15:50:54 +0500 |
commit | 022317823e6c2b5a1787854d5531e7c32881b9a6 (patch) | |
tree | 9b3f41517a89bf7c6f555ba635ccf8f0f2b60edb /web/react/components/user_settings_modal.jsx | |
parent | 2d5a181c7d64097df8014a8290be40cddb81ab16 (diff) | |
parent | ea51edf0c4a2c62ba3f6585dfde93c240c8f0a4b (diff) | |
download | chat-022317823e6c2b5a1787854d5531e7c32881b9a6.tar.gz chat-022317823e6c2b5a1787854d5531e7c32881b9a6.tar.bz2 chat-022317823e6c2b5a1787854d5531e7c32881b9a6.zip |
Merge branch 'master' of https://github.com/mattermost/platform
Conflicts:
web/react/components/mention_list.jsx
Diffstat (limited to 'web/react/components/user_settings_modal.jsx')
-rw-r--r-- | web/react/components/user_settings_modal.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/user_settings_modal.jsx b/web/react/components/user_settings_modal.jsx index d1aff74f2..702e7ad7a 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" aria-hidden="true"> + <div className="modal fade" ref="modal" id="user_settings1" role="dialog" tabIndex="-1" aria-hidden="true"> <div className="modal-dialog settings-modal"> <div className="modal-content"> <div className="modal-header"> |