You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
ddrsql
91103a4a01
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
# Conflicts:
# eShopOnContainers-ServicesAndWebApps.sln
# k8s/deployments.yaml
# k8s/gen-k8s-env-aks.ps1
# k8s/internalurls.yaml
# k8s/ocelot/configuration-web-shopping.json
# src/ApiGateways/ApiGw-Base/Program.cs
# src/ApiGateways/Mobile.Bff.Shopping/apigw/configuration.json
# src/ApiGateways/Web.Bff.Shopping/apigw/configuration.json
# src/Services/Identity/Identity.API/Configuration/Config.cs
# src/Services/Identity/Identity.API/Data/ConfigurationDbContextSeed.cs
# src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
# src/Web/WebMVC/AppSettings.cs
# src/Web/WebMVC/Startup.cs
# src/Web/WebSPA/AppSettings.cs
# src/Web/WebSPA/Client/modules/shared/models/configuration.model.ts
# src/Web/WebSPA/Client/modules/shared/services/configuration.service.ts
# src/Web/WebSPA/Client/modules/shared/services/security.service.ts
|
6 years ago |
.. |
Services
|
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev
|
6 years ago |