Merge branch 'master' into k-fet

This commit is contained in:
Aurélien Delobelle 2017-01-07 00:38:54 +01:00
commit 792c4177ec
966 changed files with 194 additions and 78265 deletions

View file

@ -124,10 +124,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/