diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:00:13 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-15 01:00:13 -0500 |
| commit | aa2836cb3859e05e9524def5ec37706e3299205c (patch) | |
| tree | ca1de8b399b578aeb5b86490451a136d9986ad1a /requirements.txt | |
| parent | 12984bca989485430d3a1be9ea35d3f61239b28f (diff) | |
| parent | c3ebf7deae0bb04f1637e9a52e7f9f38d454fec7 (diff) | |
Merge tag 'release_2012-02-11'
Quick release
Conflicts:
requirements.txt
requirements_prod.txt
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt index 1e262f6b..56bd1618 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ Django==1.3.1 -Markdown>=2.0.3 +Markdown>=2.1.1 South>=0.7.3 -pyinotify>=0.9.2 pytz>=2011n |