Merge branch 'master' of github.com:pydanny/cookiecutter-django

This commit is contained in:
Daniel Roy Greenfeld 2015-09-21 21:24:31 -07:00
commit d9e65afef1

View File

@ -260,15 +260,13 @@ LOGGING = {
'django.request': {
'handlers': ['mail_admins'],
'level': 'ERROR',
'propagate': True,
'propagate': True
},
'loggers': {
'django.security.DisallowedHost': {
'level': 'ERROR',
'handlers': ['console', 'mail_admins'],
'propagate': True,
},
},
'propagate': True
}
}
}
{% if cookiecutter.use_celery == "y" %}