Merge branch 'master' into production

2017-12-09 13:58:06 -05:00 · 2017-12-09 13:58:06 -05:00 · 2deb1a6279
parent 2f9a317a9c aadf1b1275
commit 2deb1a6279
1 changed files with 1 additions and 1 deletions
--- a/settings/common.py
+++ b/settings/common.py
@ -233,7 +233,7 @@ LOGGING = {
 # django-registration
 EMAIL_HOST = 'smtp.gluejar.com'
 DEFAULT_FROM_EMAIL = 'notices@gluejar.com'
-SERVER_EMAIL = 'unglueit@ebookfoundation.org'
+SERVER_EMAIL = 'notices@gluejar.com'
 SUPPORT_EMAIL = 'unglueit@ebookfoundation.org'
 ACCOUNT_ACTIVATION_DAYS = 30
 SESSION_COOKIE_AGE = 3628800 # 6 weeks