]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63018b5 e1184d2)
Merge branch '2.7-maintenance'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Thu, 2 Apr 2015 00:02:03 +0000 (02:02 +0200)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Thu, 2 Apr 2015 00:02:03 +0000 (02:02 +0200)

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