summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2014-12-27 18:26:48 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2014-12-27 18:26:48 +0100
commit7fd5629d23f48d69057cb2a404539b2a0f9ed107 (patch)
tree57f2ae0565f38640e357f0d1f9803180dbcb8cd0 /docs
parent6d52f6f8e688b5c4e70be8352eb02c05fea60e85 (diff)
Added release notes for the last two commits.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.7.2.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/releases/1.7.2.txt b/docs/releases/1.7.2.txt
index 31a96a4ccd..da6721a1ba 100644
--- a/docs/releases/1.7.2.txt
+++ b/docs/releases/1.7.2.txt
@@ -175,3 +175,9 @@ Bugfixes
* Corrected ``contrib.sites`` default site creation in a multiple database
setup (:ticket:`24000`).
+
+* Restored support for objects that aren't :class:`str` or :class:`bytes` in
+ :func:`~django.utils.safestring.mark_for_escaping` on Python 3.
+
+* Supported strings escaped by third-party libraries with the ``__html__``
+ convention in the template engine (:ticket:`23831`).