# HG changeset patch
# User Bernhard Reiter <bernhard@intevation.de>
# Date 1535112647 -7200
# Node ID 4b39e7f651ed8b18b067390cfd5c82e4f29ecfec
# Parent  91d0f23360e637383b431a03489d539b30ab8d43# Parent  8f3f7577fbe7effec8c3c00fbfe9d1290197b57a
merge

diff -r 91d0f23360e6 -r 4b39e7f651ed pkg/config/config.go
--- a/pkg/config/config.go	Fri Aug 24 14:02:53 2018 +0200
+++ b/pkg/config/config.go	Fri Aug 24 14:10:47 2018 +0200
@@ -131,7 +131,7 @@
 	ui("mail-port", 465, "port of server to send mail with")
 	str("mail-user", "gemma", "user to send mail with")
 	str("mail-password", "", "password of user to send mail with")
-	str("mail-from", "noreplay@localhost", "from line of mails")
+	str("mail-from", "noreply@localhost", "from line of mails")
 	str("mail-helo", "localhost", "name of server to send mail from.")
 
 	strSl("allowed-origins", allowedOrigins, "allow access for remote origins")