Christian Arenas 39e69ee4e0 Merge branch 'servicebus' into dev ...

# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/settings.json

2017-05-30 18:47:34 +02:00

..

Basket.API

Merge branch 'servicebus' into dev

2017-05-30 18:47:34 +02:00