Maria Bermudez 1bca1115a7 Fix merge conflicts

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

..

compose-file

Fix merge conflicts

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

images

Merge pull request #6725 from 2tunnels/patch-1

2019-01-15 16:57:40 -08:00

reference

Update compose-version to 1.24.0

2019-03-28 20:53:39 +01:00

aspnet-mssql-compose.md

Merge branch 'master' into name-change-for-Docker-Desktop

2019-01-14 11:14:48 -05:00

bundles.md

Update bundles.md

2019-01-11 13:55:47 -05:00

completion.md

fix formatting issues in completion.md file

2019-03-22 10:48:33 +00:00

django.md

Remove leading whitespace in code blocks from Django docs

2019-01-30 15:20:43 +13:00

env-file.md

…

environment-variables.md

Fixed env_file anchor in environment-variables.md (#8764)

2019-05-09 11:35:31 -07:00

extends.md

Fixed a sentence (#8728)

2019-05-07 18:01:13 -07:00

faq.md

…

gettingstarted.md

Merge pull request #8609 from davidism/patch-1

2019-05-23 09:54:13 +01:00

index.md

…

install.md

Add pip dependencies to compose doc for alpine (#8554)

2019-04-01 14:35:23 -04:00

link-env-deprecated.md

…

networking.md

…

overview.md

…

production.md

…

rails.md

Merge branch 'master' into name-change-for-Docker-Desktop

2019-01-14 11:14:48 -05:00

samples-for-compose.md

…

startup-order.md

Merge branch 'master' into patch-1

2018-12-18 13:27:43 -08:00

swarm.md

…

wordpress.md

Adding wordpress environment variable.

2019-01-28 21:12:09 -07:00