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

..

FunctionalTests

Merge

2017-08-30 08:08:01 +02:00

IntegrationTests

Updated aspnetcore.host to v2.0 in testing projects

2017-08-30 18:51:22 +02:00

LoadTest

Add logout at performance test

2017-09-01 15:10:20 +02:00

UnitTest

Updated aspnetcore.host to v2.0 in testing projects

2017-08-30 18:51:22 +02:00