From: David Lord <davidism@gmail.com>
Date: Thu, 2 May 2024 16:18:48 +0000 (-0700)
Subject: Merge branch '3.1.x'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbd5bcee7b15d7420a764d407bd383142957c4c3;p=thirdparty%2Fjinja.git

Merge branch '3.1.x'
---

bbd5bcee7b15d7420a764d407bd383142957c4c3
diff --cc CHANGES.rst
index 12696825,bf670420..f2121b50
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,16 -1,11 +1,22 @@@
  .. currentmodule:: jinja2
  
 +Version 3.2.0
 +-------------
 +
 +Unreleased
 +
 +-   Drop support for Python 3.7.
 +-   Use modern packaging metadata with ``pyproject.toml`` instead of ``setup.cfg``.
 +    :pr:`1793`
 +-   Use ``flit_core`` instead of ``setuptools`` as build backend.
 +
 +
+ Version 3.1.4
+ -------------
+ 
+ Unreleased
+ 
+ 
  Version 3.1.3
  -------------