external-repos/ivatar
1
0
Fork 0
mirror of https://git.linux-kernel.at/oliver/ivatar.git synced 2025-11-17 05:28:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into 'master'

Browse Source 
Merge in latest devel

See merge request oliver/ivatar!37
This commit is contained in:
Oliver Falk
2018-07-11 08:15:01 +02:00
parent d9913a8fae 88631e3772
commit 38142b303d
5 changed files with 89 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.py
View File

@@ -102,7 +102,7 @@ if 'test' not in sys.argv and 'collectstatic' not in sys.argv:
'MAILGUN_SENDER_DOMAIN': os.environ['IVATAR_MAILGUN_SENDER_DOMAIN'],
}
EMAIL_BACKEND = 'anymail.backends.mailgun.EmailBackend' # pragma: no cover
DEFAULT_FROM_EMAIL = 'ivatar@linux-kernel.at'
DEFAULT_FROM_EMAIL = 'ivatar@mg.linux-kernel.at'
try:
from ivatar.settings import DATABASES