librarian bump with proper merge

[wolnelektury.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index ed684cc..a961c4d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,13 @@
 --find-links=http://www.pythonware.com/products/pil/
 
 # django
-Django>=1.2.4,<1.3
+Django>=1.3,<1.4
 South>=0.7 # migrations for django
 django-pagination>=1.0
 django-rosetta>=0.5.3
 django-maintenancemode>=0.9
 django-piston
+django-jsonfield
 
 python-memcached
 piwik
@@ -17,7 +18,7 @@ Feedparser>=4.1
 # PIL 
 PIL>=1.1.6
 mutagen>=1.17
-sorl-thumbnail>=11.09<12
+sorl-thumbnail>=11.09,<12
 
 # home-brewed & dependencies
 lxml>=2.2.2