Eduard Tomas 10d03a68e3 Merge remote-tracking branch 'eShopOnAzure/dev' into dev ...

# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
#	src/Services/Catalog/Catalog.API/Controllers/PicController.cs
#	src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
#	src/Services/Catalog/Catalog.API/settings.json
#	src/Services/Ordering/Ordering.API/Startup.cs

2017-06-28 12:40:21 +02:00

..

BuildingBlocks

Fix merge

2017-06-26 18:05:02 +02:00

Mobile

Merge remote-tracking branch 'eShopOnAzure/dev' into dev

2017-06-28 12:40:21 +02:00

Services

Merge remote-tracking branch 'eShopOnAzure/dev' into dev

2017-06-28 12:40:21 +02:00

Web

Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev

2017-06-28 12:20:20 +02:00