diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:57:27 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:57:27 -0500 |
| commit | dbb508b7222081b523ce3e0bd2b69f5fea6c7050 (patch) | |
| tree | f5f3a97b9465504ed9e7633a0c385669b7463d3c /requirements.txt | |
| parent | fd788c5fcf9009540ad14a869dcebdfd30fb9d6f (diff) | |
| parent | b2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt index 1909da1b..08d89107 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.5.1 +Django==1.6 IPy==0.81 Markdown==2.3.1 -South==0.8.1 +South==0.8.2 bencode==1.0 django-countries==1.5 -jsmin==2.0.3 +jsmin==2.0.6 pgpdump==1.4 -pytz>=2013b +pytz>=2013.8 |