From: David Lord <davidism@gmail.com>
Date: Wed, 5 Feb 2020 16:37:15 +0000 (-0800)
Subject: Merge branch '2.11.x'
X-Git-Tag: 3.0.0a1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c75d4805889ca97948d727917dbf8f301981956;p=thirdparty%2Fjinja.git

Merge branch '2.11.x'
---

0c75d4805889ca97948d727917dbf8f301981956
diff --cc CHANGES.rst
index 5e307f85,651ab430..2253fe9c
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,15 -1,16 +1,26 @@@
  .. currentmodule:: jinja2
  
 +Version 3.0.0
 +-------------
 +
 +Unreleased
 +
 +-   Drop support for Python 2.7 and 3.5.
 +-   Bump MarkupSafe dependency to >=1.1.
 +-   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
  --------------