]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 793ddd4 fb47dfa)
Merge branch '2.9-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Tue, 10 Jan 2017 08:21:45 +0000 (09:21 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Tue, 10 Jan 2017 08:21:45 +0000 (09:21 +0100)
1  2 
CHANGES patch | diff1 | diff2 | blob | history

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