Umbraco-CMS

Files

Shannon 66aa3084f9 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Conflicts:
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/packages.config
	src/umbraco.editorControls/packages.config
	src/umbraco.macroRenderings/packages.config
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj

2014-03-17 14:15:14 +11:00

Actions

Enables change content type action for v7 as well (see issue 1468)

2014-02-19 21:48:17 +01:00

businesslogic

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-03-13 18:43:40 +11:00

helpers

Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.

2013-09-25 19:23:41 +10:00

Properties

…