Christian Arenas 794d366053 Merge branch 'feature/marketing-read-model-data' into marketingcampaign ...

# Conflicts:
#	src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
#	src/Services/Location/Locations.API/Model/UserLocation.cs

2017-06-13 17:38:07 +02:00

..

Basket/Basket.API

Merge new creation ordering workflow

2017-06-12 13:52:23 +02:00

Catalog/Catalog.API

Merge new creation ordering workflow

2017-06-12 13:52:23 +02:00

GracePeriod/GracePeriodManager

Merge new creation ordering workflow

2017-06-12 13:52:23 +02:00

Identity/Identity.API

Merge branch 'feature/track-user-location-mongodb' into dev

2017-06-13 11:26:47 +02:00

Location/Locations.API

Merge branch 'feature/marketing-read-model-data' into marketingcampaign

2017-06-13 17:38:07 +02:00

Marketing/Marketing.API

Merge branch 'feature/marketing-read-model-data' into marketingcampaign

2017-06-13 17:38:07 +02:00

Ordering

Merge new creation ordering workflow

2017-06-12 13:52:23 +02:00

Payment/Payment.API

Merge new creation ordering workflow

2017-06-12 13:52:23 +02:00