diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-12 18:36:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 18:36:39 -0600 |
| commit | fbef16f8630f74248157c2cd9e546ece355c869a (patch) | |
| tree | 95feb1a0b94f43fd38533adc508df2daf823ea86 /app/email.go | |
| parent | 56f49cf4860cfca51e852ec3e7d9df772d2b2060 (diff) | |
| parent | 32c1f7be239ddb19d6c59b114d9ae1a543f8ba9c (diff) | |
| download | chat-fbef16f8630f74248157c2cd9e546ece355c869a.tar.gz chat-fbef16f8630f74248157c2cd9e546ece355c869a.tar.bz2 chat-fbef16f8630f74248157c2cd9e546ece355c869a.zip | |
Merge branch 'release-4.7' into rm-willnorris-proxy-support
Diffstat (limited to 'app/email.go')
| -rw-r--r-- | app/email.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/email.go b/app/email.go index 54a272a3b..764dc017a 100644 --- a/app/email.go +++ b/app/email.go @@ -317,6 +317,5 @@ func (a *App) NewEmailTemplate(name, locale string) *utils.HTMLTemplate { } func (a *App) SendMail(to, subject, htmlBody string) *model.AppError { - license := a.License() - return utils.SendMailUsingConfig(to, subject, htmlBody, a.Config(), license != nil && *license.Features.Compliance) + return utils.SendMailUsingConfig(to, subject, htmlBody, a.Config()) } |