summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2011-09-13 23:35:34 +0200
committerArmin Ronacher <armin.ronacher@active-4.com>2011-09-13 23:35:34 +0200
commitec9e8eb7937f1ac6c6912f2b2bf18644bd1bbf00 (patch)
tree12c8832d54278943c73469fab95f0b2e98ca6e85 /CHANGES
parent6fa6cb0e129893b0166448563597e1d156cd8746 (diff)
parent6336e770b9434781157df62f555da5c15a1b2629 (diff)
downloadjinja2-ec9e8eb7937f1ac6c6912f2b2bf18644bd1bbf00.tar.gz
Merge branch 'master' of github.com:mitsuhiko/jinja2
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 4427436..8e76e2b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,7 +23,7 @@ Version 2.6
integers instead of longs)
- groupby filter now supports dotted notation for grouping by attributes
of attributes.
-- scoped blocks not properly treat toplevel assignments and imports.
+- scoped blocks now properly treat toplevel assignments and imports.
Previously an import suddenly "disappeared" in a scoped block.
- automatically detect newer Python interpreter versions before loading code
from bytecode caches to prevent segfaults on invalid opcodes. The segfault