]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1cd154 d3ed6c7)
Merge branch 'master' of github.com:pallets/jinja
authorArmin Ronacher <armin.ronacher@active-4.com>
Mon, 3 Apr 2017 13:12:19 +0000 (15:12 +0200)
committerArmin Ronacher <armin.ronacher@active-4.com>
Mon, 3 Apr 2017 13:12:19 +0000 (15:12 +0200)
1  2 
setup.cfg patch | diff1 | diff2 | blob | history

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