diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:43:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:43:56 -0400 |
| commit | 355087ebe2e3fbd5f860e4655888a89d9df52e34 (patch) | |
| tree | d01f6206a2f2d054d4d1931019f5ba2a248fe982 /requirements_prod.txt | |
| parent | ae785343076fd1fe8b89f69ca370f7fcd0cdcbd4 (diff) | |
| parent | ea00a099dffd7157c93af54b5817734348d2bbc6 (diff) | |
Merge branch 'archweb-generic' into master-nomake
Conflicts:
templates/public/download.html
templates/public/feeds.html
templates/public/index.html
urls.py
Diffstat (limited to 'requirements_prod.txt')
| -rw-r--r-- | requirements_prod.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/requirements_prod.txt b/requirements_prod.txt index 840e0396..c181c3af 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,13 +1,12 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.2 +-e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries +Django==1.7 IPy==0.81 -Markdown==2.4 -South==0.8.4 +Markdown==2.4.1 bencode==1.0 -django-countries==2.0 -jsmin==2.0.9 +jsmin==2.0.11 pgpdump==1.5 -psycopg2==2.5.2 +psycopg2==2.5.4 pyinotify==0.9.4 python-memcached==1.53 -pytz>=2013.8 +pytz>=2014.7 |