diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-29 01:39:43 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-29 01:39:43 -0800 |
| commit | 4244990bf118c04d4d66dd946aaf5217fc59a393 (patch) | |
| tree | 9cfad1eec8a462577e1723c62b70520994c0920a /web/react/components/activity_log_modal.jsx | |
| parent | 9677a9f71777d75f3def0b0cb238050a30ec6a67 (diff) | |
| parent | d222f6c7a3c69a68879cc0fd5aeb7343d72dfb39 (diff) | |
| download | chat-4244990bf118c04d4d66dd946aaf5217fc59a393.tar.gz chat-4244990bf118c04d4d66dd946aaf5217fc59a393.tar.bz2 chat-4244990bf118c04d4d66dd946aaf5217fc59a393.zip | |
Merge branch 'master' into mm-1355
Diffstat (limited to 'web/react/components/activity_log_modal.jsx')
| -rw-r--r-- | web/react/components/activity_log_modal.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index 7cce807a9..90f139e8b 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -102,8 +102,9 @@ module.exports = React.createClass({ <div className="modal-content"> <div className="modal-header"> <button type="button" className="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> - <h4 className="modal-title" id="myModalLabel">Active Devices</h4> + <h4 className="modal-title" id="myModalLabel">Active Sessions</h4> </div> + <p className="session-help-text">Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the "Logout" button below to end a session.</p> <div ref="modalBody" className="modal-body"> <form role="form"> { activityList } |