Merge branch 'merge_1' into edumed

[redakcja.git] / requirements.txt

diff --git a/requirements.txt b/requirements.txt
index 6ba7739..4c3aafd 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,10 +10,16 @@ httplib2 # oauth2 dependency
 # git+git://github.com/fnp/librarian.git@master#egg=librarian
 
 ## Django
 # git+git://github.com/fnp/librarian.git@master#egg=librarian
 
 ## Django

-Django>=1.1.1,<1.2
-sorl-thumbnail>=3.2
+Django>=1.3,<1.4
+sorl-thumbnail>=11.09,<12

 django-maintenancemode>=0.9
 django-pagination
 django-maintenancemode>=0.9
 django-pagination

+django-gravatar
+django-celery
+django-kombu

 
 # migrations
 south>=0.6
 
 # migrations
 south>=0.6

+
+# etherpad lite api
+-e git+git://github.com/devjones/PyEtherpadLite.git#egg=PyEtherpadLite