Merge branch 'dev' into 'master'

Dev See merge request !79
8 years ago · 65f1ceaf2d
parent 07b22a3c53 26976b46ca
commit 65f1ceaf2d
1 changed files with 2 additions and 0 deletions
--- a/lms/settings.py
+++ b/lms/settings.py
@ -67,6 +67,8 @@ DATABASES = {
 SESSION_ENGINE = 'redis_sessions.session'
 CELERY_EMAIL_CHUNK_SIZE = 1

+DATA_UPLOAD_MAX_MEMORY_SIZE = 12621440
+
 CACHES = {
    'default': env.cache(),
 }