]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8261473 342e88a)
Merge branch '2.7-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 4 Jul 2013 14:25:55 +0000 (16:25 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 4 Jul 2013 14:25:55 +0000 (16:25 +0200)
1  2 
jinja2/testsuite/filters.py patch | diff1 | diff2 | blob | history

diff --cc jinja2/testsuite/filters.py
Simple merge
Mirror of https://github.com/pallets/jinja.git