]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c1f192 f4ddad8)
Merge branch 'pr/451'
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 25 May 2015 10:25:02 +0000 (12:25 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 25 May 2015 10:25:02 +0000 (12:25 +0200)

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