]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05b0a7e 414c1d1)
Merge branch 'master' of github.com:pallets/jinja
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Jan 2017 19:11:22 +0000 (20:11 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Jan 2017 19:11:22 +0000 (20:11 +0100)

Trivial merge
Mirror of https://github.com/pallets/jinja.git