diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-22 16:31:58 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-22 16:31:58 -0600 |
| commit | c2d98c2c1f4860c11aedf43aff5e360256a89835 (patch) | |
| tree | 4304f7584025477d74e5e70677c4f5a70c26bb58 /api/templates | |
| parent | 6e2c1b7fd5248c6a4a91edcd59fa124c8d3c744a (diff) | |
| parent | d352c5b64dddfb8e46b18edbd7352c41495078a1 (diff) | |
| download | chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.gz chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.tar.bz2 chat-c2d98c2c1f4860c11aedf43aff5e360256a89835.zip | |
merging
Diffstat (limited to 'api/templates')
| -rw-r--r-- | api/templates/error.html | 4 | ||||
| -rw-r--r-- | api/templates/password_change_body.html | 2 | ||||
| -rw-r--r-- | api/templates/password_change_subject.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/api/templates/error.html b/api/templates/error.html index 6944f6c68..9fb2da1ba 100644 --- a/api/templates/error.html +++ b/api/templates/error.html @@ -11,8 +11,8 @@ <script src="/static/js/bootstrap-3.3.5.min.js"></script> <script src="/static/js/react-bootstrap-0.25.1.min.js"></script> - <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon"> - <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon"> + <link id="favicon" rel="icon" href="/static/images/favicon/favicon-16x16.png" type="image/x-icon"> + <link rel="shortcut icon" href="/static/images/favicon/favicon-16x16.png" type="image/x-icon"> <link href='/static/css/google-fonts.css' rel='stylesheet' type='text/css'> <link rel="stylesheet" href="/static/css/styles.css"> diff --git a/api/templates/password_change_body.html b/api/templates/password_change_body.html index 82f4d5429..6199a3423 100644 --- a/api/templates/password_change_body.html +++ b/api/templates/password_change_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 updated your password</h2> - <p>You updated your password for {{.Props.TeamDisplayName}} on {{ .Props.TeamURL }} by {{.Props.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator.</p> + <p>Your password has been updated for {{.Props.TeamDisplayName}} on {{ .Props.TeamURL }} by {{.Props.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator.</p> </td> </tr> <tr> diff --git a/api/templates/password_change_subject.html b/api/templates/password_change_subject.html index e7a794090..0cbf052c1 100644 --- a/api/templates/password_change_subject.html +++ b/api/templates/password_change_subject.html @@ -1 +1 @@ -{{define "password_change_subject"}}You updated your password for {{.Props.TeamDisplayName}} on {{ .ClientCfg.SiteName }}{{end}} +{{define "password_change_subject"}}Your password has been updated for {{.Props.TeamDisplayName}} on {{ .ClientCfg.SiteName }}{{end}} |