]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73351f3 ba8be08)
Merge branch 'master' of github.com:pallets/jinja
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 29 Dec 2016 21:54:50 +0000 (22:54 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 29 Dec 2016 21:54:50 +0000 (22:54 +0100)

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