From: David Lord <davidism@gmail.com>
Date: Tue, 18 May 2021 20:40:36 +0000 (-0700)
Subject: Merge branch '3.0.x'
X-Git-Tag: 3.1.0~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdbda09e4493b4f53c0bd3a9188786b463bef9fe;p=thirdparty%2Fjinja.git

Merge branch '3.0.x'
---

cdbda09e4493b4f53c0bd3a9188786b463bef9fe
diff --cc CHANGES.rst
index 18cc04b1,fc540af5..a3434967
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -1,12 -1,6 +1,12 @@@
  .. currentmodule:: jinja2
  
 +Version 3.1.0
 +-------------
 +
 +Unreleased
 +
 +
- Version 3.0.1
+ Version 3.0.2
  -------------
  
  Unreleased