diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-08-21 18:17:24 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-08-21 18:17:24 +0500 |
| commit | 299bf056a584dd71cf0285b6ef1bbd596c07c0fe (patch) | |
| tree | c1f32092efa1294c0a75d1e2f23154605ec8d001 /web/react/components/find_team.jsx | |
| parent | afb09a1b9dd83e480a8c4f5744bd79cafb88a682 (diff) | |
| parent | 4a022752faf9a2b6c4de5cfa65f23adb578a96a5 (diff) | |
| download | chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.tar.gz chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.tar.bz2 chat-299bf056a584dd71cf0285b6ef1bbd596c07c0fe.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into mm-1696
Conflicts:
web/react/components/setting_upload.jsx
web/react/components/team_import_tab.jsx
Diffstat (limited to 'web/react/components/find_team.jsx')
| -rw-r--r-- | web/react/components/find_team.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/find_team.jsx b/web/react/components/find_team.jsx index 91a842ffc..d896a1f12 100644 --- a/web/react/components/find_team.jsx +++ b/web/react/components/find_team.jsx @@ -47,7 +47,7 @@ module.exports = React.createClass({ return ( <div> <h4>{"Find Your " + utils.toTitleCase(strings.Team)}</h4> - <p>{"An email was sent with links to any " + strings.TeamPlural}</p> + <p>{"An email was sent with links to any " + strings.TeamPlural + " to which you are a member."}</p> </div> ); } @@ -56,7 +56,7 @@ module.exports = React.createClass({ <div> <h4>Find Your Team</h4> <form onSubmit={this.handleSubmit}> - <p>{"We'll send you an email with links to your " + strings.TeamPlural + "."}</p> + <p>{"Get an email with links to any " + strings.TeamPlural + " to which you are a member."}</p> <div className="form-group"> <label className='control-label'>Email</label> <div className={ email_error ? "form-group has-error" : "form-group" }> |