diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-12-04 23:07:59 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-12-04 23:07:59 -0300 |
commit | 988c2c6d400b3721464c2891891807d504b076b0 (patch) | |
tree | 013dc3d676edad701d0d3bbd239bc2df0cdf76b4 /requirements_prod.txt | |
parent | 60a1fc6cc4cef0b9eed58ea4f0ca003b76ec382a (diff) | |
parent | 183c4d9cefa95f46c3fa3a6936f837542426eac2 (diff) |
Merge branch 'master' of ssh://gparabola/parabolaweb
Conflicts:
local_settings.py.example
media/archweb.css
packages/templatetags/package_extras.py
public/views.py
templates/packages/details.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/search.html
templates/public/download.html
templates/todolists/view.html
Diffstat (limited to 'requirements_prod.txt')
-rw-r--r-- | requirements_prod.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/requirements_prod.txt b/requirements_prod.txt index 9749a072..47d37ce2 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -2,5 +2,6 @@ Django==1.3.1 Markdown==2.0.3 MySQL-python==1.2.3 South==0.7.3 +pyinotify==0.9.2 python-memcached==1.47 -pytz>=2011c +pytz>=2011n |