Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589

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'

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>
             );