Eduard Tomàs 34a8ad3171 Merge branch 'netcore2' into dev ...

# Conflicts:
#	cli-linux/build-bits-linux.sh
#	docker-compose.ci.build.yml
#	src/Services/Location/Locations.API/Dockerfile.nanowin
#	src/Services/Marketing/Marketing.API/Dockerfile.nanowin
#	src/Services/Payment/Payment.API/Dockerfile.nanowin
#	src/Web/WebStatus/Dockerfile.nanowin

2017-09-05 16:12:42 +02:00

..

Services

Merge branch 'netcore2' into dev

2017-09-05 16:12:42 +02:00