Files
Umbraco-CMS/build
Shannon b0060a9592 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0
Conflicts:
	build/InstallGit.cmd
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
	src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
	src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
	src/Umbraco.Web/WebServices/SaveFileController.cs
2016-01-06 10:46:38 +01:00
..
2015-12-28 10:35:54 +01:00
2016-01-05 16:11:59 +01:00