]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65fbf32 d1a32e7)
Merge branch 'feature/no-locals'
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jan 2017 11:53:39 +0000 (12:53 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jan 2017 11:53:39 +0000 (12:53 +0100)

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