diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-09-08 10:27:49 -0300 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-09-08 10:27:49 -0300 |
| commit | eb8373aa80905fc57173da03ed5b2bd972c83d53 (patch) | |
| tree | d543342c710b633fe75313ece472314202e7bc44 /api/user.go | |
| parent | a5ebbcfdb4f151de204b6be276c5f07175ceb82a (diff) | |
| parent | b2b2d141a9c4b423e6920930b726becd1e46436c (diff) | |
| download | chat-eb8373aa80905fc57173da03ed5b2bd972c83d53.tar.gz chat-eb8373aa80905fc57173da03ed5b2bd972c83d53.tar.bz2 chat-eb8373aa80905fc57173da03ed5b2bd972c83d53.zip | |
Merge branch 'release-3.4' RC4
Diffstat (limited to 'api/user.go')
| -rw-r--r-- | api/user.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go index daa405ad4..a33e2f7d7 100644 --- a/api/user.go +++ b/api/user.go @@ -2156,7 +2156,7 @@ func emailToLdap(c *Context, w http.ResponseWriter, r *http.Request) { return } - go sendSignInChangeEmail(c, user.Email, c.GetSiteURL(), "LDAP") + go sendSignInChangeEmail(c, user.Email, c.GetSiteURL(), "AD/LDAP") m := map[string]string{} m["follow_link"] = "/login?extra=signin_change" |