diff options
| author | Dan McGee <dan@archlinux.org> | 2013-02-27 01:45:14 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2013-02-27 01:45:14 +0100 |
| commit | f85cc0482a44ced9aed372b8972d31040ed4043b (patch) | |
| tree | f0790247018bfa5c243fff623f917d7a7a8bf0cf /requirements.txt | |
| parent | 1457f78594a25f8cfb8ad1f9b3cd6d071a3d6a93 (diff) | |
| parent | a25cc4ff459ab0070ce48730f6c6fdc227860f08 (diff) | |
| download | archweb-f85cc0482a44ced9aed372b8972d31040ed4043b.tar.gz archweb-f85cc0482a44ced9aed372b8972d31040ed4043b.tar.xz | |
Merge branch 'django-1.5'
Conflicts:
requirements.txt
requirements_prod.txt
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt index bffdea6..24f83d5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.4.4 +Django==1.5 Markdown==2.2.1 South==0.7.6 bencode==1.0 |