From: David Lord <davidism@gmail.com>
Date: Thu, 30 Jan 2020 17:56:19 +0000 (-0800)
Subject: Merge branch '2.11.x'
X-Git-Tag: 3.0.0a1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=547e6e39ec3994c9dd0c806ee7bb29353843060e;p=thirdparty%2Fjinja.git

Merge branch '2.11.x'
---

547e6e39ec3994c9dd0c806ee7bb29353843060e
diff --cc CHANGES.rst
index 9e26dff6,9ec8a3a4..5e307f85
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,15 -1,14 +1,24 @@@
  .. 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.
 +
 +
+ Version 2.11.1
+ --------------
+ 
+ Unreleased
+ 
+ -   Fix a bug that prevented looking up a key after an attribute
+     (``{{ data.items[1:] }}``) in an async template. :issue:`1141`
+ 
+ 
  Version 2.11.0
  --------------