diff options
| author | Stas Vovk <stasvovk@gmail.com> | 2015-10-12 22:39:04 +0300 |
|---|---|---|
| committer | Stas Vovk <stasvovk@gmail.com> | 2015-10-12 22:39:04 +0300 |
| commit | f4f43357973c94cbb67a9bfe08d2f0b74885aefe (patch) | |
| tree | 5574dab758893965c58ca740c97b3257bbfeaca4 /web | |
| parent | 8d8e8ec41eba1aaac717819be3e688f8076aeba4 (diff) | |
| parent | 1ce37c316adceafe2f7409576c378407fe80d7b7 (diff) | |
| download | chat-f4f43357973c94cbb67a9bfe08d2f0b74885aefe.tar.gz chat-f4f43357973c94cbb67a9bfe08d2f0b74885aefe.tar.bz2 chat-f4f43357973c94cbb67a9bfe08d2f0b74885aefe.zip | |
Merge branch 'master' into PLT-589
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/get_link_modal.jsx | 1 | ||||
| -rw-r--r-- | web/react/components/user_settings/user_settings_general.jsx | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx index 234013b93..eb6bfa9b6 100644 --- a/web/react/components/get_link_modal.jsx +++ b/web/react/components/get_link_modal.jsx @@ -96,7 +96,6 @@ export default class GetLinkModal extends React.Component { <p> Send teammates the link below for them to sign-up to this team site. <br /><br /> - Be careful not to share this link publicly, since anyone with the link can join your team. </p> <textarea className='form-control no-resize' diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index c23c61948..66d83725c 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -368,8 +368,7 @@ export default class UserSettingsGeneralTab extends React.Component { const extraInfo = ( <span> - {'Use Nickname for a name you might be called that is different from your first name and user name.'} - {'This is most often used when two or more people have similar sounding names and usernames.'} + {'Use Nickname for a name you might be called that is different from your first name and username. This is most often used when two or more people have similar sounding names and usernames.'} </span> ); |