cookiecutter-django/{{cookiecutter.project_slug}}/compose
Bruno Alla 9e7320ea1b Merge branch 'master' into fix_upgrade_py39
# Conflicts:
#	README.rst
#	{{cookiecutter.project_slug}}/.gitlab-ci.yml
#	{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
#	{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
2021-04-08 18:43:54 +01:00
..
local Merge branch 'master' into fix_upgrade_py39 2021-04-08 18:43:54 +01:00
production Merge branch 'master' into fix_upgrade_py39 2021-04-08 18:43:54 +01:00