diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-02 20:40:34 -0400 |
| commit | ea00a099dffd7157c93af54b5817734348d2bbc6 (patch) | |
| tree | 89fa4ba0c0ac19a4286ba4c4cb64f77536b1a098 /requirements.txt | |
| parent | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (diff) | |
| parent | 0f0ce18109f8104d7b2abe9024ef26fa07ff0292 (diff) | |
Merge branch 'archweb' into archweb-generic
Conflicts:
templates/public/download.html
templates/public/index.html
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt index 81070449..eff75bad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,9 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.6.2 +-e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries +Django==1.7 IPy==0.81 -Markdown==2.4 -South==0.8.4 +Markdown==2.4.1 bencode==1.0 -django-countries==2.0 -jsmin==2.0.9 +jsmin==2.0.11 pgpdump==1.5 -pytz>=2013.8 +pytz>=2014.7 |