diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:10:46 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 21:10:46 -0400 |
| commit | 05a44e86fbb656e5a4f6228c28b61df740549b34 (patch) | |
| tree | 4d272046b88cd07f82d48da8a2390d785ace96c5 /requirements.txt | |
| parent | c6eb3b7b3c77d1b70126e0755c9ee66de88d5395 (diff) | |
| parent | 67b87ed4c0abd593e2833b3aa6b969c2e2451b60 (diff) | |
Merge branch 'archweb-generic' into master-nomake
# Conflicts:
# local_settings.py.example
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 e2b49aba..5d544e3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin --e git+git://github.com/SmileyChris/django-countries.git@a2c924074dbe2f0b9b3059bf70064aeadf5643ed#egg=django-countries Django==1.7 IPy==0.81 Jinja2==2.7.3 Markdown==2.4.1 bencode==1.0 django-jinja==1.0.4 +django_countries==3.0 jsmin==2.0.11 pgpdump==1.5 pytz>=2014.7 |