]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de1405f 147472a)
Merge branch 'master' of github.com:mitsuhiko/jinja2
authorArmin Ronacher <armin.ronacher@active-4.com>
Fri, 31 May 2013 00:00:56 +0000 (01:00 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Fri, 31 May 2013 00:00:56 +0000 (01:00 +0100)

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