Permalink
Browse files

Merge branch 'master' into django-1.4

Conflicts:
	requirements.txt
  • Loading branch information...
2 parents f9b3c1b + 8a602e4 commit 52bc9f5e7c755b185b9bbd1caeb16490ac648aaa @nanonyme committed Mar 31, 2012
Showing with 12 additions and 10 deletions.
  1. +9 −0 common-requirements.txt
  2. +1 −0 dev-requirements.txt
  3. +2 −10 requirements.txt
View
@@ -0,0 +1,9 @@
+boto==2.2.2
+Django==1.4
+django-celery==2.5.1
+django-htmlmin==0.5.1
+django-kombu==0.9.4
+django-storages==1.1.4
+django-dajaxice==0.2
+South==0.7.3
+Sphinx==1.1.2
View
@@ -0,0 +1 @@
+-r common-requirements.txt
View
@@ -1,15 +1,7 @@
-boto==2.2.2
-Django==1.4
-django-celery==2.5.1
-django-htmlmin==0.5.1
-django-kombu==0.9.4
-django-pylibmc-sasl==0.2.4
-django-storages==1.1.4
-django-dajaxice==0.2
+-r common-requirements.txt
Fabric==1.4.0
gunicorn==0.14.1
newrelic==1.1.0.192
psycopg2==2.4.4
pylibmc==1.2.2
-South==0.7.3
-Sphinx==1.1.2
+django-pylibmc-sasl==0.2.4

0 comments on commit 52bc9f5

Please sign in to comment.