]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b927c9f 84e8712)
Merge branch 'pgjones-master'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Thu, 19 May 2016 18:59:56 +0000 (20:59 +0200)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Thu, 19 May 2016 18:59:56 +0000 (20:59 +0200)

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