From bb639518a05ac4a6e45b7e795cfdc5ff45ebf369 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Fri, 17 Jul 2015 07:27:37 -0700
Subject: Fixed typo

---
 api/templates/reset_body.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'api/templates/reset_body.html')

diff --git a/api/templates/reset_body.html b/api/templates/reset_body.html
index 3a5d62ab4..4b5976663 100644
--- a/api/templates/reset_body.html
+++ b/api/templates/reset_body.html
@@ -18,7 +18,7 @@
                                         <tr>
                                             <td style="border-bottom: 1px solid #ddd; padding: 0 0 20px;">
                                                 <h2 style="font-weight: normal; margin-top: 10px;">You requested a password reset</h2>
-                                                <p>To change your password, click below.<br>If you did not mean to reset your password, please ignore this email and your password will remain the same.</p>
+                                                <p>To change your password, click "Reset Password" below.<br>If you did not mean to reset your password, please ignore this email and your password will remain the same.</p>
                                                 <p style="margin: 20px 0 15px">
                                                     <a href="{{.Props.ResetUrl}}" style="background: #2389D7; border-radius: 3px; color: #fff; border: none; outline: none; min-width: 200px; padding: 15px 25px; font-size: 14px; font-family: inherit; cursor: pointer; -webkit-appearance: none;text-decoration: none;">Reset Password</a>
                                                 </p>
-- 
cgit v1.2.3-1-g7c22


From c6fb95912bb481791c1ca370a46a4da9c05d05ad Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 8 Jul 2015 11:50:10 -0400
Subject: Changing the way we mattermost handles URLs. team.domain.com becomes
 domain.com/team. Renaming team.Name to team.DisplayName and team.Domain to
 team.Name. So: team.Name -> url safe name. team.DisplayName -> nice name for
 users

---
 api/templates/reset_body.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'api/templates/reset_body.html')

diff --git a/api/templates/reset_body.html b/api/templates/reset_body.html
index 4b5976663..af9f6b4e8 100644
--- a/api/templates/reset_body.html
+++ b/api/templates/reset_body.html
@@ -9,7 +9,7 @@
                         <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
                             <tr>
                                 <td style="padding: 20px 30px 10px; text-align:left;">
-                                    <img src="{{.TeamUrl}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
+                                    <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt="">
                                 </td>
                             </tr>
                             <tr>
@@ -37,7 +37,7 @@
                             <tr>
                                 <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;">
                                     <p style="margin: 25px 0;">
-                                        <img width="65" src="{{.TeamUrl}}/static/images/circles.png" alt="">
+                                        <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt="">
                                     </p>
                                     <p style="padding: 0 50px;">
                                         (c) 2015 SpinPunch, Inc. 855 El Camino Real, 13A-168, Palo Alto, CA, 94301.<br>
-- 
cgit v1.2.3-1-g7c22