3 Commits

Author	SHA1	Message	Date
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
Shaun Walker	18b91ee5f1	minor fixes to data and UI customization	2017-06-23 11:49:25 -07:00
PLAINCONCEPTS\ccanizares	c29b783d93	rename identity project	2017-01-30 11:35:16 +01:00