]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d760b78 368e1b1)
Merge branch '2.8-maintenance'
authorMarkus Unterwaditzer <markus@unterwaditzer.net>
Tue, 12 Apr 2016 19:44:39 +0000 (21:44 +0200)
committerMarkus Unterwaditzer <markus@unterwaditzer.net>
Tue, 12 Apr 2016 19:44:39 +0000 (21:44 +0200)
1  2 
jinja2/filters.py patch | diff1 | diff2 | blob | history

diff --cc jinja2/filters.py
Simple merge
Mirror of https://github.com/pallets/jinja.git