cookiecutter-django/{{cookiecutter.project_slug}}/compose/local
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
..
django Merge branch 'master' into fix_upgrade_py39 2021-04-08 18:43:54 +01:00
docs Update from Python3.8 to Python3.9 2021-01-26 16:13:27 +01:00
node Add a node image to run Gulp when selecting it with Docker (#1687) 2019-03-25 12:10:55 +00:00