Update maintenance with master

.editorconfig

@@ -12,7 +12,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.{html,css,scss,json,yml}]
+[*.{html,css,scss,json,yml,xml}]
 indent_style = space
 indent_size = 2
 
@@ -21,3 +21,7 @@ trim_trailing_whitespace = false
 
 [Makefile]
 indent_style = tab
+
+[nginx.conf]
+indent_style = space
+indent_size = 2

.github/CONTRIBUTORS-template.md

@@ -0,0 +1,56 @@
+# Contributors
+
+## Core Developers
+
+These contributors have commit flags for the repository, and are able to
+accept and merge pull requests.
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Github</th>
+    <th>Twitter</th>
+  </tr>
+  {%- for contributor in core_contributors %}
+  <tr>
+    <td>{{ contributor.name }}</td>
+    <td>
+      <a href="https://github.com/{{ contributor.github_login }}">{{ contributor.github_login }}</a>
+    </td>
+    <td>{{ contributor.twitter_username }}</td>
+  </tr>
+  {%- endfor %}
+</table>
+
+*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
+the Cookiecutter core team.*
+
+## Other Contributors
+
+Listed in alphabetical order.
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Github</th>
+    <th>Twitter</th>
+  </tr>
+  {%- for contributor in other_contributors %}
+  <tr>
+    <td>{{ contributor.name }}</td>
+    <td>
+      <a href="https://github.com/{{ contributor.github_login }}">{{ contributor.github_login }}</a>
+    </td>
+    <td>{{ contributor.twitter_username }}</td>
+  </tr>
+  {%- endfor %}
+</table>
+
+### Special Thanks
+
+The following haven't provided code directly, but have provided
+guidance and advice.
+
+-   Jannis Leidel
+-   Nate Aune
+-   Barry Morrison

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [pydanny, browniebroke]
+patreon: feldroy
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ["https://www.patreon.com/browniebroke"]

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,58 @@
+---
+name: Bug Report
+about: Report a bug
+labels: bug
+---
+
+## What happened?
+
+## What should've happened instead?
+
+## Additional details
+
+<!-- To assist you best, please include commands that you've run, options you've selected and any relevant logs -->
+
+* Host system configuration:
+    * Version of cookiecutter CLI (get it with `cookiecutter --version`):
+    * OS name and version:
+
+      On Linux, run
+      ```bash
+      lsb_release -a 2> /dev/null || cat /etc/redhat-release 2> /dev/null || cat /etc/*-release 2> /dev/null || cat /etc/issue 2> /dev/null
+      ```
+
+      On MacOs, run
+      ```bash
+      sw_vers
+      ```
+
+      On Windows, via CMD, run
+      ```
+      systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
+      ```
+
+
+      ```bash
+      # Insert here the OS name and version
+
+      ```
+
+    * Python version, run `python3 -V`:
+    * Docker version (if using Docker), run `docker --version`:
+    * docker-compose version (if using Docker), run `docker-compose --version`:
+    * ...
+* Options selected and/or [replay file](https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html):
+  On Linux and MacOS: `cat ${HOME}/.cookiecutter_replay/cookiecutter-django.json`
+  (Please, take care to remove sensitive information)
+    ```json
+    # Insert here the replay file content
+    ```
+<summary>
+Logs:
+<details>
+<pre>
+$ cookiecutter https://github.com/cookiecutter/cookiecutter-django
+project_name [Project Name]: ...
+</pre>
+</details>
+</summary>

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,13 @@
+---
+name: New Feature Proposal
+about: Propose a new feature
+labels: enhancement
+---
+
+## Description
+
+What are you proposing? How should it be implemented?
+
+## Rationale
+
+Why should this feature be implemented?

.github/ISSUE_TEMPLATE/paid-support.md

@@ -0,0 +1,12 @@
+---
+name: Paid Support Request
+about: Ask Core Team members to help you out
+---
+
+Provided your question goes beyond [regular support](https://github.com/cookiecutter/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
+
+* Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
+
+* Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
+
+* Bruno Alla, Core Developer ([GitHub](https://github.com/sponsors/browniebroke)).

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,11 @@
+---
+name: Question
+about: Please ask your question on StackOverflow, Discord or GitHub Discussions.
+labels: question
+---
+
+First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help, we recommend one of these 3 main channels:
+
+- If your issue is related to Django + something else but was generated with cookiecutter-django, the best is to post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you would get more visibility from other communities as well.
+- Join us on [Discord](https://discord.gg/uFXweDQc5a) and ask around.
+- Start [a discussion](https://github.com/cookiecutter/cookiecutter-django/discussions) on our project's GitHub.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+<!-- Thank you for helping us out: your efforts mean a great deal to the project and the community as a whole! -->
+
+
+## Description
+
+<!-- What's it you're proposing? -->
+
+Checklist:
+
+- [ ] I've made sure that tests are updated accordingly (especially if adding or updating a template option)
+- [ ] I've updated the documentation or confirm that my change doesn't require any updates
+
+## Rationale
+
+<!--
+Why does this project need the change you're proposing?
+If this pull request fixes an open issue, don't forget to link it with `Fix #NNNN`
+-->

.github/changelog-template.md

@@ -0,0 +1,8 @@
+{%- for change_type, pulls in grouped_pulls.items() %}
+{%- if pulls %}
+### {{ change_type }}
+{%- for pull_request in pulls %}
+- {{ pull_request.title }} ([#{{ pull_request.number }}]({{ pull_request.html_url }}))
+{%- endfor -%}
+{% endif -%}
+{% endfor -%}