]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8e7d98 c74de72)
Merge branch '2.9-maintenance'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Tue, 24 Jan 2017 15:36:16 +0000 (16:36 +0100)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Tue, 24 Jan 2017 15:36:16 +0000 (16:36 +0100)

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