Merge pull request #1 from mattermost/master

to me

1 files changed, 5 insertions, 0 deletions

diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index b165a59ad..a9c2433f2 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -1126,6 +1126,9 @@ module.exports = React.createClass({
                     <NotificationsTab user={this.state.user} activeSection={this.props.activeSection} updateSection={this.props.updateSection} />
                 </div>
             );
+
+        /* Temporarily removing sessions and activity_log tabs
+
         } else if (this.props.activeTab === 'sessions') {
             return (
                 <div>
@@ -1138,6 +1141,8 @@ module.exports = React.createClass({
                     <AuditTab activeSection={this.props.activeSection} updateSection={this.props.updateSection} />
                 </div>
             );
+        */
+
         } else if (this.props.activeTab === 'appearance') {
             return (
                 <div>