]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5447aa7 6c9e5ae)
Merge branch 'master' into sprint-branch
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 11:44:48 +0000 (12:44 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 18 May 2013 11:44:48 +0000 (12:44 +0100)

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