]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e94dd1f 2b5b35a)
Merge branch 'master' into sprint-branch
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 11:04:19 +0000 (12:04 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 11:04:19 +0000 (12:04 +0100)
1  2 
jinja2/testsuite/regression.py patch | diff1 | diff2 | blob | history

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