diff options
| author | Stas Vovk <stas@vovk.me> | 2015-10-13 13:27:34 +0300 |
|---|---|---|
| committer | Stas Vovk <stas@vovk.me> | 2015-10-13 13:27:34 +0300 |
| commit | 822881e51aa2edce1c4d7d2e11bc44c3886daf1e (patch) | |
| tree | 86c0a80048eeb66e71a80170a9a06f5931349a09 /web | |
| parent | 450b56c1bd428115f66d6f0bf87691e50aaaaffa (diff) | |
| parent | f4f43357973c94cbb67a9bfe08d2f0b74885aefe (diff) | |
| download | chat-822881e51aa2edce1c4d7d2e11bc44c3886daf1e.tar.gz chat-822881e51aa2edce1c4d7d2e11bc44c3886daf1e.tar.bz2 chat-822881e51aa2edce1c4d7d2e11bc44c3886daf1e.zip | |
Merge branch 'PLT-589' of github.com:stasvovk/platform 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> ); |