Merge branch 'upload' into deletesketches

Conflicts:
	asuzr/views.py
This commit is contained in:
2015-06-18 17:29:44 +05:00
4 changed files with 34 additions and 10 deletions

View File

@@ -87,7 +87,9 @@ STATIC_URL = '/static/'
TEMPLATE_DIRS = ('templates/')
TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.request',)
TEMPLATE_CONTEXT_PROCESSORS += ('django.core.context_processors.request',
'django.core.context_processors.csrf',
)
MEDIA_ROOT = 'media/'