Merge branch 'django-ftl:master' into fix-CONTRIBUTING.rst

Author: samineer

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
-  - repo: 'https://gitlab.com/pycqa/flake8'
+  - repo: 'https://github.com/PyCQA/flake8'
     rev: 4.0.1
     hooks:
       - id: flake8