summaryrefslogtreecommitdiffstats
path: root/requirements.txt
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-11-26 04:10:25 +0100
committerDan McGee <dan@archlinux.org>2013-11-26 04:10:25 +0100
commit108cfaa8df3b94031a3436fbb71c76fdc0650ba1 (patch)
tree61c30085b49e63c6605dfebac3bef5e123cbaa70 /requirements.txt
parent06317908f73420224fce0c400048c3b7dcfc8abb (diff)
parent071bd6bd71f681c45048fc0a0961e58d43d44d48 (diff)
downloadarchweb-108cfaa8df3b94031a3436fbb71c76fdc0650ba1.tar.gz
archweb-108cfaa8df3b94031a3436fbb71c76fdc0650ba1.tar.xz
Merge branch 'django-1.6'
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 479c213..08d8910 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-e git+git://github.com/fredj/cssmin.git@master#egg=cssmin
-Django==1.5.5
+Django==1.6
IPy==0.81
Markdown==2.3.1
South==0.8.2
@@ -7,4 +7,4 @@ bencode==1.0
django-countries==1.5
jsmin==2.0.6
pgpdump==1.4
-pytz>=2013.7
+pytz>=2013.8