]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6e48b4 d3b456f)
Merge branch '2.8-maintenance'
authorArmin Ronacher <armin.ronacher@active-4.com>
Thu, 29 Dec 2016 13:17:42 +0000 (14:17 +0100)
committerArmin Ronacher <armin.ronacher@active-4.com>
Thu, 29 Dec 2016 13:17:42 +0000 (14:17 +0100)
1  2 
CHANGES patch | diff1 | diff2 | blob | history

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