Shannon f4b707e928 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 ...

Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/umbraco.businesslogic/StateHelper.cs

2014-01-16 20:49:19 +11:00

17 KiB

Raw Blame History

View Raw