Merge release branch 'release-1.1.0'

docker/1.1/Dockerfile

@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
 WORKDIR /mattermost
 
 # Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v1.1.0-rc1/mattermost.tar.gz /
+ADD https://github.com/mattermost/platform/releases/download/v1.1.0-rc2/mattermost.tar.gz /
 RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
 ADD config_docker.json /
 ADD docker-entry.sh /

web/react/components/email_verify.jsx

@@ -22,7 +22,7 @@ export default class EmailVerify extends React.Component {
             title = global.window.config.SiteName + ' Email Verified';
             body = <p>Your email has been verified! Click <a href={this.props.teamURL + '?email=' + this.props.userEmail}>here</a> to log in.</p>;
         } else {
-            title = global.window.config.SiteName + ' Email Not Verified';
+            title = global.window.config.SiteName + ': You are almost done';
             body = <p>Please verify your email address. Check your inbox for an email.</p>;
             resend = (
                 <button