Merge branch 'master' into upgrade/django-2.1

# Conflicts:
#	README.rst
This commit is contained in:
Bruno Alla 2019-04-17 08:40:06 +01:00
commit 9ca91ef428

View File

@ -51,7 +51,7 @@ Features
* Docker support using docker-compose_ for development and production (using Traefik_ with LetsEncrypt_ support)
* Procfile_ for deploying to Heroku
* Instructions for deploying to PythonAnywhere_
* Run tests with unittest or py.test
* Run tests with unittest or pytest
* Customizable PostgreSQL version
.. _`maintained Foundation fork`: https://github.com/Parbhat/cookiecutter-django-foundation