]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f7e161 8189d21)
Merge branch '2.8-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 20 Nov 2015 09:05:39 +0000 (10:05 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 20 Nov 2015 09:05:39 +0000 (10:05 +0100)

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