Merge branch 'master-jinja2' of https://github.com/saschpe/pecan into saschpe-master-jinja2

Conflicts: setup.py
2013-01-18 14:32:27 -05:00
parent a516871cd6 f737834d78
commit 613b176aa1
1 changed files with 1 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@ tests_require = requirements + [
    'virtualenv',
    'Genshi',
    'Kajiki',
-    'Jinja',
+    'Jinja2',
    'gunicorn'
 ]
 if sys.version_info < (2, 7):