Christian Arenas 03f23eafa4 Merge branch 'load-testing' into dev
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Identity/Identity.API/Configuration/Config.cs
#	src/Web/WebMVC/appsettings.json
2017-07-10 14:40:26 +02:00
..
2017-06-28 18:06:16 +02:00