summaryrefslogtreecommitdiff
path: root/requirements.txt
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2010-12-31 15:42:55 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2010-12-31 15:42:55 -0300
commitc9178286885d60741eb0e696c3e345e3b0dfb9e2 (patch)
tree7738211d84337e897acfd2263be0b33352becae0 /requirements.txt
parentebcd492d39cd0525b768a48558e50041aa0961e3 (diff)
parent84897adcdc698678f2ee8d2292cfe4271c6335e4 (diff)
Merge git://projects.archlinux.org/archweb
Conflicts: templates/public/index.html urls.py
Diffstat (limited to 'requirements.txt')
-rw-r--r--requirements.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index 6d858a11..f4d80eeb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-Django==1.2.3
+Django==1.2.4
Markdown==2.0.3
-South==0.7.2
+South==0.7.3