Eduard Tomas 756cb3dafa Merge branch 'master' into dev ...

# Conflicts:
#	src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
#	src/Web/WebMVC/Startup.cs

2017-04-05 17:05:14 +02:00

..

Catalog.WebForms/Catalog.WebForms

Merge remote-tracking branch 'origin/windows-containers-test' into dev

2017-03-24 09:35:57 +01:00

WebMonolithic

delete temp readme

2017-03-31 14:42:50 -07:00

WebMVC

Merge branch 'master' into dev

2017-04-05 17:05:14 +02:00

WebSPA

Merge from Dev

2017-04-05 11:12:49 +02:00

WebStatus

Fixed healthcheck errors

2017-03-31 12:47:56 +02:00