]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9b9258 7589409)
Merge branch '2.9-maintenance' of github.com:pallets/jinja into 2.9-maintenance
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 9 Jan 2017 10:03:10 +0000 (11:03 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 9 Jan 2017 10:03:10 +0000 (11:03 +0100)

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