summaryrefslogtreecommitdiff
path: root/requirements_prod.txt
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-03-23 20:19:34 -0500
committerDan McGee <dan@archlinux.org>2012-03-23 20:19:34 -0500
commit822898e57bc6d4e008ef58da309857e9ef8c98e6 (patch)
tree1af0836c927b87e2249628d47cdfefe77c3b18fd /requirements_prod.txt
parentea87160c397fe1daf63851f0ed0be146bea79196 (diff)
parent8e10699d53281be53c88a3695de6aa496e084dc6 (diff)
Merge branch 'django14'
Conflicts: templates/releng/result_section.html
Diffstat (limited to 'requirements_prod.txt')
-rw-r--r--requirements_prod.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/requirements_prod.txt b/requirements_prod.txt
index ebac73ca..7f7663a8 100644
--- a/requirements_prod.txt
+++ b/requirements_prod.txt
@@ -1,8 +1,8 @@
-Django==1.3.1
+Django==1.4
Markdown==2.1.1
MySQL-python==1.2.3
-South==0.7.3
+South==0.7.4
pgpdump==1.1
pyinotify==0.9.3
python-memcached==1.48
-pytz>=2011n
+pytz>=2012b