aboutsummaryrefslogtreecommitdiff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2020-02-05 08:37:15 -0800
committerDavid Lord <davidism@gmail.com>2020-02-05 08:37:15 -0800
commit0c75d4805889ca97948d727917dbf8f301981956 (patch)
treeba74065de5ba7129e60da5e2e81106f3e13ae729 /CHANGES.rst
parent547e6e39ec3994c9dd0c806ee7bb29353843060e (diff)
parent9fe06d886672a303d98ad7d6d23ba8bbe3c0b0b5 (diff)
downloadjinja-0c75d4805889ca97948d727917dbf8f301981956.tar.gz
Merge branch '2.11.x'
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst13
1 files changed, 12 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 5e307f85..2253fe9c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,10 +10,21 @@ Unreleased
- Bump Babel optional dependency to >=2.1.
+2.11.2
+------
+
+Unreleased
+
+- Fix a bug that caused callable objects with ``__getattr__``, like
+ :class:`~unittest.mock.Mock` to be treated as a
+ :func:`contextfunction`. :issue:`1145`
+
+
+
Version 2.11.1
--------------
-Unreleased
+Released 2020-01-30
- Fix a bug that prevented looking up a key after an attribute
(``{{ data.items[1:] }}``) in an async template. :issue:`1141`