diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 18:01:59 -0500 |
| commit | 764182c0ca66b538cef994409f04f876681598cd (patch) | |
| tree | 2f399c618484c00f84875b437f3fcfcc9c509424 /requirements_prod.txt | |
| parent | 8844fd0c6361d3a6ccd88647276e9af0e6cd64d2 (diff) | |
| parent | 822898e57bc6d4e008ef58da309857e9ef8c98e6 (diff) | |
Merge commit '822898e' (Merge branch 'django14')
Conflicts:
requirements.txt
requirements_prod.txt
templates/base.html
templates/devel/clock.html
templates/public/download.html
templates/public/index.html
templates/releng/results.html
Diffstat (limited to 'requirements_prod.txt')
| -rw-r--r-- | requirements_prod.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/requirements_prod.txt b/requirements_prod.txt index 5870d42f..80fa2b5b 100644 --- a/requirements_prod.txt +++ b/requirements_prod.txt @@ -1,8 +1,8 @@ -Django==1.3.1 +Django==1.4 Markdown>=2.1.1 psycopg2 -South>=0.7.3 +South>=0.7.4 pgpdump>=1.1 pyinotify>=0.9.2 python-memcached>=1.48 -pytz>=2011n +pytz>=2012b |