summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-02-16 19:54:30 +0500
committerHarrison Healey <harrisonmhealey@gmail.com>2017-02-16 09:54:30 -0500
commitc6ffb73999ff4374503ea57d1b1e6485a5bee472 (patch)
treea9784a52220934ab9ba1744cbddbb16ca12b3439 /webapp/components/user_settings
parentd60d05f2d86400faf3303e655c46c5b8d77879c4 (diff)
downloadchat-c6ffb73999ff4374503ea57d1b1e6485a5bee472.tar.gz
chat-c6ffb73999ff4374503ea57d1b1e6485a5bee472.tar.bz2
chat-c6ffb73999ff4374503ea57d1b1e6485a5bee472.zip
Multiple Ui improvements (#5398)
* PLT-5475 - Adjusting tutorials on mobile * PLT-5475 - Adjusting tutorials on mobile * PLT-5457 - Adjusting save button * PLT-5443 - Updating highllight on status compact * PLT-5413 - Team sidebar not scrolling * PLT-5358 - Maintaing aspect ratio for emojis * PLT-5411 - Removing help text from LDAP signin * PLT-5420 - Updating emoticon for headings * Updating emoji size * Updating emoji size * Removing emoticon tag * Updating emoticon sizes * Updating emoji size
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_general.jsx1
1 files changed, 0 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx
index 7ac2069ff..d79507511 100644
--- a/webapp/components/user_settings/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general.jsx
@@ -500,7 +500,6 @@ class UserSettingsGeneralTab extends React.Component {
}}
/>
</div>
- {helpText}
</div>
);
} else if (this.props.user.auth_service === Constants.SAML_SERVICE) {