summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-08-09 09:21:02 -0400
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-08-09 09:21:02 -0400
commit80583252e09a325a298a8253ef0f32d9ec6b8dc0 (patch)
treec222b2a82c07877fbd619bdfc5caecb9ca607e34
parentc45c3697152598f5fe46e0d6dd54f039e562c79f (diff)
parentfb8be74971bef0e553099b60b7d6bd501c3bb495 (diff)
downloadaskbot-80583252e09a325a298a8253ef0f32d9ec6b8dc0.tar.gz
askbot-80583252e09a325a298a8253ef0f32d9ec6b8dc0.tar.bz2
askbot-80583252e09a325a298a8253ef0f32d9ec6b8dc0.zip
Merge branch 'master' of github.com:ASKBOT/askbot-devel
-rw-r--r--askbot_requirements.txt2
-rw-r--r--setup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/askbot_requirements.txt b/askbot_requirements.txt
index 2cac4e63..70bc5874 100644
--- a/askbot_requirements.txt
+++ b/askbot_requirements.txt
@@ -10,7 +10,7 @@ django-threaded-multihost
django-robots
unidecode
django-countries==1.0.5
-django-celery==2.2.3
+django-celery==2.2.7
django-kombu==0.9.2
django-followit
django-recaptcha-works
diff --git a/setup.py b/setup.py
index cbbdb4ca..331d3fb1 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ install_requires = [
'django-robots',
'unidecode',
'django-countries==1.0.5',
- 'django-celery==2.2.3',
+ 'django-celery==2.2.7',
'django-kombu==0.9.2',
'django-followit',
'django-recaptcha-works',