summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 2c4f4e31c..468fe1ed1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -32,8 +32,11 @@ Features
Bug Fixes
---------
-- ``mako_templating``: added defensive workaround for non-importability
- of ``mako`` (due to upstream ``markupsafe`` dropping Python 3.2 support).
+- ``mako_templating``: added defensive workaround for non-importability of
+ ``mako`` due to upstream ``markupsafe`` dropping Python 3.2 support. Mako
+ templating will no longer work under the combination of MarkupSafe 0.17 and
+ Python 3.2 (although the combination of MarkupSafe 0.17 and Python 3.3 or any
+ supported Python 2 version will work OK).
- View lookup will now search for valid views based on the inheritance
hierarchy of the context. It tries to find views based on the most