Merge branch 'master' into Kerl/use_django_custommail

This commit is contained in:
Martin Pépin 2017-01-13 01:02:01 +01:00
commit 993b8ae87b
968 changed files with 9176 additions and 79623 deletions

View file

@ -125,10 +125,6 @@ USE_TZ = True
STATIC_URL = '/static/'
STATIC_ROOT = '/var/www/static/'
STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'static/'),
)
# Media upload (through ImageField, SiteField)
# https://docs.djangoproject.com/en/1.9/ref/models/fields/
@ -164,6 +160,7 @@ CAS_EMAIL_FORMAT = "%s@clipper.ens.fr"
AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend',
'gestioncof.shared.COFCASBackend',
'kfet.backends.GenericTeamBackend',
)
# EMAIL_HOST="nef.ens.fr"