Files
Umbraco-CMS/build
Shannon 3be1cd8b0d Merge branch 'dev-v7' into 7.3.0
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
2015-05-07 16:24:29 +10:00
..
2015-05-07 16:24:29 +10:00
2015-05-05 12:27:01 +10:00
2015-05-06 11:08:25 +02:00