Merge branch 'master' into production

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index fb64d95..037fa76 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,8 @@ django-pipeline>=1.2
 django-pagination>=1.0
 django-maintenancemode>=0.10
 django-piston
-django-jsonfield
+#django-jsonfield
+-e git+git://github.com/bradjasper/django-jsonfield.git@2f427368ad70bf8d9a0580df58ec0eb0654d62ae#egg=django-jsonfield
 django-picklefield
 django-allauth
 django-honeypot
@@ -32,7 +33,7 @@ lxml>=2.2.2
 # MySQL-python>=1.2,<2.0
 
 # celery tasks
-django-celery
+django-celery>=2.5.1
 django-kombu
 
 # spell checking