diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
| commit | b2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (patch) | |
| tree | 2355b55efce971b6c7044b1f04b4a3730d2da50f /requirements.txt | |
| parent | 0877f0389f187cf2cbf026c73b27071857d3e6f7 (diff) | |
| parent | fab8d437929fce202b11707e1cacbc079f61edbc (diff) | |
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes
Conflicts:
templates/news/list.html
templates/public/index.html
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt index 479c2134..08d89107 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 |