]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a65f1eb 83f6a68)
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 10:18:59 +0000 (11:18 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 10:18:59 +0000 (11:18 +0100)
1  2 
docs/templates.rst patch | diff1 | diff2 | blob | history

diff --cc docs/templates.rst
Simple merge
Mirror of https://github.com/pallets/jinja.git