| commit | a65f1eb9065d78fcd0b4871782bbe008b5f8ab7b | [log] [tgz] |
|---|---|---|
| author | Armin Ronacher <armin.ronacher@active-4.com> | Sun May 19 11:18:19 2013 +0100 |
| committer | Armin Ronacher <armin.ronacher@active-4.com> | Sun May 19 11:18:19 2013 +0100 |
| tree | eab2b23c5f9585280da31e64510b286c6c259286 | |
| parent | 0a6f850d9a4e53950cd89cfec5c91a5a082ed7af [diff] [blame] | |
| parent | e4a74f9b9b76fc841e431123d91abcb5259ac747 [diff] [blame] |
Merge remote-tracking branch 'kristi/master'
diff --git a/CHANGES b/CHANGES index c6f95bc..036558a 100644 --- a/CHANGES +++ b/CHANGES
@@ -23,6 +23,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 -----------