]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f15b814 70a2bc0)
Merge pull request #226 from dzen/master
authorArmin Ronacher <armin.ronacher@active-4.com>
Wed, 22 May 2013 13:27:51 +0000 (06:27 -0700)
committerArmin Ronacher <armin.ronacher@active-4.com>
Wed, 22 May 2013 13:27:51 +0000 (06:27 -0700)
Fix MarkupSafe dependancy case


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