Merge pull request #7 from mattermost/master

to me

2 files changed, 4 insertions, 4 deletions

diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 103a93bc6..65f1da1f8 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -52,20 +52,20 @@ var FindTeamDomain = React.createClass({
                 <div>
                     <span className="signup-team__name">{ config.SiteName }</span>
                     <br/>
-                    <span className="signup-team__subdomain">Enter your {strings.TeamPlural} domain.</span>
+                    <span className="signup-team__subdomain">Enter your {strings.Team}'s domain.</span>
                     <br/>
                     <br/>
                 </div>
                 <form onSubmit={this.handleSubmit}>
                     <div className={server_error ? 'form-group has-error' : 'form-group'}>
                         { server_error }
-                        <input type="text" className="form-control" name="domain" ref="domain" placeholder="teamdomain" />
+                        <input type="text" className="form-control" name="domain" ref="domain" placeholder="team domain" />
                     </div>
                     <div className="form-group">
                         <button type="submit" className="btn btn-primary">Continue</button>
                     </div>
                     <div>
-                        <span>Don't remember your {strings.TeamPlural} domain? <a href="/find_team">Find it here</a></span>
+                        <span>Don't remember your {strings.Team}'s domain? <a href="/find_team">Find it here</a></span>
                     </div>
                     <br/>
                     <br/>
diff --git a/web/static/config/config.js b/web/static/config/config.js
index 5a12942c8..82d4bbf70 100644
--- a/web/static/config/config.js
+++ b/web/static/config/config.js
@@ -35,4 +35,4 @@ var strings = {
     TeamPlural: "teams",
     Company: "company",
     CompanyPlural: "companies"
-}
+};