From: David Lord <davidism@gmail.com>
Date: Mon, 25 Apr 2022 19:41:39 +0000 (-0700)
Subject: Merge branch '3.1.x'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0dd7753d082f8fe6c3225bb3e51de0bbd6fb7e8;p=thirdparty%2Fjinja.git

Merge branch '3.1.x'
---

a0dd7753d082f8fe6c3225bb3e51de0bbd6fb7e8
diff --cc CHANGES.rst
index 788809f9,da7d0a68..57c12158
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,11 -1,14 +1,20 @@@
  .. currentmodule:: jinja2
  
 +Version 3.2.0
 +-------------
 +
 +Unreleased
 +
 +
+ Version 3.1.2
+ -------------
+ 
+ Unreleased
+ 
+ -   Add parameters to ``Environment.overlay`` to match ``__init__``.
+     :issue:`1645`
+ 
+ 
  Version 3.1.1
  -------------