eiximenis 0e119eac86 Merge branch 'xamarin-oidcclient' into bff ...

# Conflicts:
#	.dockerignore
#	docker-compose.override.yml
#	docker-compose.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	k8s/deploy.ps1
#	k8s/deployments.yaml
#	k8s/frontend.yaml
#	src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs

2018-03-23 12:37:12 +01:00

..

Services

Merge branch 'xamarin-oidcclient' into bff

2018-03-23 12:37:12 +01:00