]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf43b5c a1f76f9)
Merge branch '2.7-maintenance'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Wed, 11 Mar 2015 20:32:16 +0000 (21:32 +0100)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Wed, 11 Mar 2015 20:32:16 +0000 (21:32 +0100)

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