]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b8a14a 31e0024)
Merge branch '2.9-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sun, 8 Jan 2017 08:43:57 +0000 (09:43 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sun, 8 Jan 2017 08:43:57 +0000 (09:43 +0100)

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