]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 853d865 1eeaccc)
Merge branch 'pr/266'
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Dec 2013 22:26:58 +0000 (22:26 +0000)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 12 Dec 2013 22:26:58 +0000 (22:26 +0000)

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