Eduard Tomas 96c3f5c2bc Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev ...

# Conflicts:
#	docker-compose.override.yml
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
#	src/Web/WebMVC/wwwroot/css/site.min.css
#	src/Web/WebSPA/AppSettings.cs

2017-06-28 12:20:20 +02:00

..

Identity.API

Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev

2017-06-28 12:20:20 +02:00