diff options
| author | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
|---|---|---|
| committer | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
| commit | ba1270df2d3d835b397317f133963e7b517242f1 (patch) | |
| tree | 1265a142a1fd9951d30ae11648e7fbfb5806e594 /modules/mailer/mail.go | |
| parent | ba0feadc34400cb91ff23f66096884d862651cdd (diff) | |
| parent | 405ee14711ab946bd709ec28a526890c40cbc03b (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
conf/app.ini
Diffstat (limited to 'modules/mailer/mail.go')
| -rw-r--r-- | modules/mailer/mail.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go index 5a662b90..6c73e7e5 100644 --- a/modules/mailer/mail.go +++ b/modules/mailer/mail.go @@ -45,7 +45,6 @@ func GetMailTmplData(u *models.User) map[interface{}]interface{} { data["AppName"] = setting.AppName data["AppVer"] = setting.AppVer data["AppUrl"] = setting.AppUrl - data["AppLogo"] = setting.AppLogo data["ActiveCodeLives"] = setting.Service.ActiveCodeLives / 60 data["ResetPwdCodeLives"] = setting.Service.ResetPwdCodeLives / 60 if u != nil { |