git.ipfire.org Git - thirdparty/jinja.git/commit

]> git.ipfire.org Git - thirdparty/jinja.git/commit

projects / thirdparty / jinja.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 840e7e0 7e912c6)

author	Armin Ronacher <armin.ronacher@active-4.com>
	Sun, 19 May 2013 10:09:19 +0000 (11:09 +0100)
committer	Armin Ronacher <armin.ronacher@active-4.com>
	Sun, 19 May 2013 10:09:19 +0000 (11:09 +0100)
commit	f3acf0b7b37876775a6f4d8bb3b9b8469c693ba9
tree	3871f4d32338b66d3c54f9de170c6c0bc554d498	tree
parent	840e7e060e3537172c57a8a96cf5bc502f55b67f	commit \| diff
parent	7e912c6dfa7a17dd1334ecb1a8d57dd5722b633a	commit \| diff

Merge remote-tracking branch 'wking/keep-trailing-newline'

CHANGES	diff1 \|	diff2 \|	blob \| history
docs/templates.rst	diff1 \|	diff2 \|	blob \| history
jinja2/defaults.py	diff1 \|	diff2 \|	blob \| history
jinja2/environment.py	diff1 \|	diff2 \|	blob \| history
jinja2/ext.py	diff1 \|	diff2 \|	blob \| history
jinja2/lexer.py	diff1 \|	diff2 \|	blob \| history
jinja2/testsuite/lexnparse.py	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/pallets/jinja.git