]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd11bcd 48196fb)
Merge branch 'pr/314'
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jun 2014 15:37:47 +0000 (21:37 +0600)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jun 2014 15:37:47 +0000 (21:37 +0600)

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