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

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