ddrsql 9c516b6936 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev ...

# Conflicts:
#	README.md
#	docker-compose.override.yml
#	docker-compose.prod.yml
#	docker-compose.yml
#	k8s/deploy.ps1
#	k8s/ocelot/deployment.yaml
#	src/ApiGateways/ApiGw-Base/Dockerfile

2018-04-17 12:24:13 +08:00

..

deployment.yaml

Updated k8s file to use only ocelotapigw image

2018-04-03 18:01:38 +02:00