summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2013-05-19 11:18:19 +0100
committerArmin Ronacher <armin.ronacher@active-4.com>2013-05-19 11:18:19 +0100
commita65f1eb9065d78fcd0b4871782bbe008b5f8ab7b (patch)
treeeab2b23c5f9585280da31e64510b286c6c259286 /CHANGES
parent0a6f850d9a4e53950cd89cfec5c91a5a082ed7af (diff)
parente4a74f9b9b76fc841e431123d91abcb5259ac747 (diff)
downloadjinja2-a65f1eb9065d78fcd0b4871782bbe008b5f8ab7b.tar.gz
Merge remote-tracking branch 'kristi/master'
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index c6f95bc..036558a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,7 @@ Version 2.7
- Added support for changing from newline to different signs in the `wordwrap`
filter.
- Added support for ignoring memcache errors silently.
+- Added support for keeping the trailing newline in templates.
Version 2.6
-----------