summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-07-29 20:55:56 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-07-29 20:55:56 +0500
commit1c186121fe04fb61d945f0b57112e28675c8e066 (patch)
treef2cf511b15990bd01bfde349016388af39f8d340 /web/react/components/user_settings.jsx
parent5d77ff4bcde3496554551701438c1f42550e58b3 (diff)
parent27dbcd8767426a60699d2acbeeb9b8a825d5b728 (diff)
downloadchat-1c186121fe04fb61d945f0b57112e28675c8e066.tar.gz
chat-1c186121fe04fb61d945f0b57112e28675c8e066.tar.bz2
chat-1c186121fe04fb61d945f0b57112e28675c8e066.zip
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'web/react/components/user_settings.jsx')
-rw-r--r--web/react/components/user_settings.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 2ac9a2371..e1ae6da52 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -617,7 +617,7 @@ var SecurityTab = React.createClass({
<br></br>
<a data-toggle="modal" className="security-links theme" data-target="#access-history" href="#" onClick={this.handleHistoryOpen}><i className="fa fa-clock-o"></i>View Access History</a>
<b> </b>
- <a data-toggle="modal" className="security-links theme" data-target="#activity-log" href="#" onClick={this.handleDevicesOpen}><i className="fa fa-globe"></i>View and Logout of Active Devices</a>
+ <a data-toggle="modal" className="security-links theme" data-target="#activity-log" href="#" onClick={this.handleDevicesOpen}><i className="fa fa-globe"></i>View and Logout of Active Sessions</a>
</div>
</div>
);