summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2013-05-18 12:07:34 +0100
committerArmin Ronacher <armin.ronacher@active-4.com>2013-05-18 12:07:34 +0100
commite2fc8749bcb4f9fdc8e26a00bc91ab801166d2af (patch)
tree3caaf0b3142645e97a3c311cc3435ea499f903e3 /CHANGES
parent7e58e36cf4c54749fd29378126307b74b9494b96 (diff)
parent728d69abad71e6b3664d1fc67a4584371ab43b10 (diff)
downloadjinja2-e2fc8749bcb4f9fdc8e26a00bc91ab801166d2af.tar.gz
Merge branch 'master' into sprint-branch
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 95fd482..e4aa398 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,8 @@ Version 2.7
- Python requirement changed: 2.6, 2.7 or >= 3.3 are required now,
supported by same source code, using the "six" compatibility library.
- Allow `contextfunction` and other decorators to be applied to `__call__`.
+- Added support for changing from newline to different signs in the `wordwrap`
+ filter.
Version 2.6
-----------