Merge branch 'master' into rwd

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index d6355f2..3ed01b3 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,13 +3,13 @@
 
 # django
 Django>=1.5,<1.6
-fnpdjango>=0.1.6,<0.2
+fnpdjango>=0.1.8,<0.2
 South>=0.7 # migrations for django
 django-pipeline>=1.2.24,<1.3
 django-pagination>=1.0
 django-maintenancemode>=0.10
 django-piston>=0.2.2.1,<0.2.3
--e git+git://github.com/bradjasper/django-jsonfield.git@e67ec8c3652e61d8b47cc8db012a63f5ad39323d#egg=django-jsonfield
+jsonfield>=0.9.20
 django-picklefield
 
 #django-allauth<0.10 with migration fix