diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-21 12:26:27 -0800 |
| commit | 848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09 (patch) | |
| tree | 98390442e8052b8e02469e5ccf7596e22b7ea07f /api/templates/email_change_subject.html | |
| parent | e87adce4a059b97a65198b326be6304abdf4e657 (diff) | |
| parent | bee26e3f2654ce7acce647818847480569236343 (diff) | |
| download | chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.gz chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.tar.bz2 chat-848eeeeef4ed277ceb00d3fc6c8a0303c0e72d09.zip | |
fixing merge conflicts
Diffstat (limited to 'api/templates/email_change_subject.html')
| -rw-r--r-- | api/templates/email_change_subject.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/templates/email_change_subject.html b/api/templates/email_change_subject.html index 612dfcbe7..5690b148a 100644 --- a/api/templates/email_change_subject.html +++ b/api/templates/email_change_subject.html @@ -1 +1 @@ -{{define "email_change_subject"}}You updated your email for {{.Props.TeamName}} on {{ .Props.Domain }}{{end}} +{{define "email_change_subject"}}You updated your email for {{.Props.TeamDisplayName}} on {{ .Props.Domain }}{{end}} |