Merge branch 'master' into production

[redakcja.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index b52baef..7cca9db 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
 ## Python libraries
 lxml>=2.2
 ## Python libraries
 lxml>=2.2

-mercurial>=1.3.1
+mercurial>=1.6

 PyYAML>=3.0
 PIL>=1.1
 
 ## Book conversion library
 git+git://github.com/fnp/librarian.git@master#egg=librarian
 
 PyYAML>=3.0
 PIL>=1.1
 
 ## Book conversion library
 git+git://github.com/fnp/librarian.git@master#egg=librarian
 

-## Django 
+## Django

 Django>=1.1.1,<1.2
 sorl-thumbnail>=3.2
 django-maintenancemode>=0.9
 Django>=1.1.1,<1.2
 sorl-thumbnail>=3.2
 django-maintenancemode>=0.9