]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe63b44 4780c2c)
Merge pull request #112 from Cito/master
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 11:31:48 +0000 (04:31 -0700)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 19 May 2013 11:31:48 +0000 (04:31 -0700)
Addition/correction for pull request #69 - add note to docs

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