Merge branch 'master' into feat/components

Author: fsbraun

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
           - id: pyupgrade
             args: ["--py37-plus"]
     - repo: https://github.com/adamchainz/django-upgrade
-      rev: "1.16.0"
+      rev: "1.18.0"
       hooks:
           - id: django-upgrade
             args: [--target-version, "2.2"]