]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0d47b9 8f7290a)
Merge branch 'override-codegen-context'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Mon, 6 Apr 2015 12:28:25 +0000 (14:28 +0200)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Mon, 6 Apr 2015 12:28:25 +0000 (14:28 +0200)

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