]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 059fbe5 add7916)
Merge branch '2.9-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Sat, 28 Jan 2017 14:34:25 +0000 (15:34 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Sat, 28 Jan 2017 14:34:25 +0000 (15:34 +0100)
1  2 
CHANGES patch | diff1 | diff2 | blob | history

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