Merge pull request #610 from jab/jab-do_truncate

author Armin Ronacher <armin.ronacher@active-4.com>

Fri, 6 Jan 2017 12:08:57 +0000 (13:08 +0100)

committer GitHub <noreply@github.com>

Fri, 6 Jan 2017 12:08:57 +0000 (13:08 +0100)
author Armin Ronacher <armin.ronacher@active-4.com>
Fri, 6 Jan 2017 12:08:57 +0000 (13:08 +0100)
committer GitHub <noreply@github.com>
Fri, 6 Jan 2017 12:08:57 +0000 (13:08 +0100)
diff --cc jinja2/filters.py
Simple merge
diff --cc tests/test_filters.py
Simple merge
author	Armin Ronacher <armin.ronacher@active-4.com>
	Fri, 6 Jan 2017 12:08:57 +0000 (13:08 +0100)
committer	GitHub <noreply@github.com>
	Fri, 6 Jan 2017 12:08:57 +0000 (13:08 +0100)
		1	2
jinja2/filters.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_filters.py	patch \|	diff1 \|	diff2 \|	blob \| history