diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-08-06 00:06:51 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-08-06 00:06:51 -0600 |
| commit | 004317994057a974e36dab450f388005386bf209 (patch) | |
| tree | a1ec58537152d28a783bcb349c151f4d1e336171 /requirements.txt | |
| parent | 4ec2197deab2f7df1cb94a6506fac9127b3ae414 (diff) | |
| parent | d4731a373ca665d4547eb0e89cdf270d41c44243 (diff) | |
Merge branch 'archweb-generic'
# Conflicts:
# public/tests.py
# templates/base.html
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt index 7b8c4822..6ca63480 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin -Django==1.7.7 -IPy==0.81 +Django==1.7.8 +IPy==0.83 Jinja2==2.7.3 -Markdown==2.6.1 +Markdown==2.6.2 MarkupSafe==0.23 bencode==1.0 django-countries==3.3 -django-jinja==1.3.2 +django-jinja==1.3.3 jsmin==2.1.1 pgpdump==1.5 -pytz>=2015.2 +pytz>=2015.4 |