cookiecutter-django/{{cookiecutter.project_slug}}/compose
Bruno Alla 0702e3cad2 Merge branch 'master' into traefik-nonroot
# Conflicts:
#	{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
#	{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
2020-01-11 15:42:31 +00:00
..
local Update python image to 3.7 2019-09-29 09:41:13 -03:00
production Merge branch 'master' into traefik-nonroot 2020-01-11 15:42:31 +00:00