Shannon b533a9f690 Merge commit '85a74e4fa700c83bab4bf3436f69f045029932cd' into 7.1.0 ...

Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Controllers/UmbLoginController.cs
	src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
	src/Umbraco.Web/Controllers/UmbProfileController.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs

2014-03-13 14:12:02 +11:00

..

.nuget

…

DesktopMediaUploader

…

packages

…

SQLCE4Umbraco

Updates some tests and fixes a couple things

2014-03-04 16:40:23 +11:00

umbraco.businesslogic

…

umbraco.cms

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

2014-03-10 17:30:46 +11:00

umbraco.controls

…

Umbraco.Core

Merge commit '85a74e4fa700c83bab4bf3436f69f045029932cd' into 7.1.0

2014-03-13 14:12:02 +11:00

umbraco.datalayer

…

umbraco.editorControls

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

2014-03-06 20:22:32 +11:00

umbraco.interfaces

…

umbraco.MacroEngines

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

2014-03-11 14:47:00 +11:00

Umbraco.MSBuild.Tasks

…

umbraco.providers

…

Umbraco.Tests

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

2014-03-13 11:11:51 +11:00

Umbraco.Web

Merge commit '85a74e4fa700c83bab4bf3436f69f045029932cd' into 7.1.0

2014-03-13 14:12:02 +11:00

Umbraco.Web.UI

fixes unit tests

2014-03-13 11:10:29 +11:00

Umbraco.Web.UI.Client

fix typos, thousands separator and casing of installer facts

2014-03-12 11:05:50 +01:00

UmbracoExamine

…

UmbracoExamine.Azure

…

UmbracoExamine.PDF

…

UmbracoExamine.PDF.Azure

…

WebPi

…

SolutionInfo.cs

…

Umbraco.MSBuild.Tasks.sln

…

umbraco.presentation.targets

…

umbraco.sln

…

umbraco.sln.DotSettings

…

umbraco.vssscc

…