Maria Bermudez 1bca1115a7 Fix merge conflicts

2019-05-31 09:38:54 -07:00

..

compose-file-v1.md

Fix typo: docker_compose.yml -> docker-compose.yml

2019-02-09 15:11:15 +02:00

compose-file-v2.md

compose-file: remove reference to custom init path (#8628)

2019-04-12 19:04:12 +02:00

compose-versioning.md

Use site parameter to use latest compose file versions in examples (#8630)

2019-04-12 15:25:47 +02:00

index.md

Fix merge conflicts

2019-05-31 09:38:54 -07:00