diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:35:23 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:35:23 -0400 |
| commit | 824bd93116c4c0a48d7112ae0bceb46e70851df5 (patch) | |
| tree | 21285571c08e286891b8e7740c543941798fe778 /requirements_prod.txt | |
| parent | 7ccaa7be630e50ce40182d168d41c2f333005443 (diff) | |
| parent | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (diff) | |
Merge branch 'archweb-generic' into master-nomake
Conflicts:
templates/public/download.html
Diffstat (limited to 'requirements_prod.txt')
| -rw-r--r-- | requirements_prod.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/requirements_prod.txt b/requirements_prod.txt index e609c5d6..840e0396 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,13 +1,13 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.1 +Django==1.6.2 IPy==0.81 -Markdown==2.3.1 +Markdown==2.4 South==0.8.4 bencode==1.0 -django-countries==1.5 -jsmin==2.0.8 -pgpdump==1.4 -psycopg2==2.5.1 +django-countries==2.0 +jsmin==2.0.9 +pgpdump==1.5 +psycopg2==2.5.2 pyinotify==0.9.4 python-memcached==1.53 pytz>=2013.8 |