Files
Umbraco-CMS/src/SQLCE4Umbraco
Shannon 95ff94c532 Merge branch 'dev-v7' into 7.3.0
Conflicts:
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/packages.config
2015-05-11 12:26:53 +10:00
..
2015-05-11 12:26:53 +10:00