]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c7b51b 3d82fc3)
Merge branch '2.7-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Wed, 7 Aug 2013 11:31:17 +0000 (12:31 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Wed, 7 Aug 2013 11:31:17 +0000 (12:31 +0100)

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