]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46acbf0 f6b654d)
Merge branch 'merwok-patch-1'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Mon, 1 Jun 2015 15:05:36 +0000 (17:05 +0200)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Mon, 1 Jun 2015 15:05:41 +0000 (17:05 +0200)
Fix #455


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