summaryrefslogtreecommitdiffstats
path: root/conf/app.ini
diff options
context:
space:
mode:
author无闻 <u@gogs.io>2014-12-21 01:55:28 -0500
committer无闻 <u@gogs.io>2014-12-21 01:55:28 -0500
commit030b3d751e3fc55429ed4cbab76d85d610688d0c (patch)
treea6c0a794b164d32adb93488b5afb5446b44ca5e0 /conf/app.ini
parent79537467da16a6eb877df20f295a447037092903 (diff)
parentc884ecfea18b001ceb9cdbe98c8618a345f460e0 (diff)
downloadgitea-030b3d751e3fc55429ed4cbab76d85d610688d0c.tar.gz
gitea-030b3d751e3fc55429ed4cbab76d85d610688d0c.zip
Merge pull request #766 from phsmit/correct_from
Correct usage of FROM in email creation
Diffstat (limited to 'conf/app.ini')
-rw-r--r--conf/app.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/app.ini b/conf/app.ini
index e1455f0e1e..467b430365 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -98,7 +98,7 @@ SUBJECT = %(APP_NAME)s
HOST =
; Do not verify the certificate of the server. Only use this for self-signed certificates
SKIP_VERIFY =
-; Mail from address
+; Mail from address, RFC 5322. This can be just an email address, or the "Name" <email@example.com> format
FROM =
; Mailer user name and password
USER =