From: David Lord <davidism@gmail.com>
Date: Fri, 18 Feb 2022 01:04:40 +0000 (-0800)
Subject: Merge branch '3.0.x'
X-Git-Tag: 3.1.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e6c4bb5644817a5dd272a0d7655b5a0e30b015;p=thirdparty%2Fjinja.git

Merge branch '3.0.x'
---

80e6c4bb5644817a5dd272a0d7655b5a0e30b015
diff --cc .pre-commit-config.yaml
index 639441dd,07f84920..e855723d
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@@ -6,9 -6,9 +6,9 @@@ repos
      rev: v2.31.0
      hooks:
        - id: pyupgrade
 -        args: ["--py36-plus"]
 +        args: ["--py37-plus"]
    - repo: https://github.com/asottile/reorder_python_imports
-     rev: v2.6.0
+     rev: v2.7.1
      hooks:
        - id: reorder-python-imports
          args: ["--application-directories", "src"]