Eduard Tomas 9c4f4a4e7f 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

..

Identity.API

Merge branch 'master' into dev

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