summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-02-25 09:50:50 -0500
committerJoram Wilander <jwawilander@gmail.com>2016-02-25 09:50:50 -0500
commite66520ea47819851d0d3b28a68da9c2b8f6ea404 (patch)
treefdbd571e2b70f1c0a7c376906c67eb79ccba70e1 /web/react
parent6f319fc64c9a947d8f076262aaab51354cb39ecd (diff)
parent7679637019f91f115431687430f2eb71d1d0748c (diff)
downloadchat-e66520ea47819851d0d3b28a68da9c2b8f6ea404.tar.gz
chat-e66520ea47819851d0d3b28a68da9c2b8f6ea404.tar.bz2
chat-e66520ea47819851d0d3b28a68da9c2b8f6ea404.zip
Merge pull request #2245 from mattermost/esethna-patch-1
Update activity_log_modal.jsx help text to remove hard coded session length
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/activity_log_modal.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index 1a0c9c6d5..95b4caa12 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -254,7 +254,7 @@ export default class ActivityLogModal extends React.Component {
<p className='session-help-text'>
<FormattedMessage
id='activity_log.sessionsDescription'
- defaultMessage="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."
+ defaultMessage="Sessions are created when you log in to a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the System Admin. If you want to log out sooner, use the 'Logout' button below to end a session."
/>
</p>
{content}