Shannon 0d8ffc0e67 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 ...

Conflicts:
	src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/MockTests.cs
	src/Umbraco.Web/Cache/DistributedCacheExtensions.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs

2014-04-23 20:45:02 +10:00

..

.nuget

…

DesktopMediaUploader

…

packages

…

SQLCE4Umbraco

…

umbraco.businesslogic

Fixes: U4-4610 Unmapped members in Automapper

2014-04-14 15:20:02 +10:00

umbraco.cms

Fixes: U4-459 Public Access permissions not set on distributed servers

2014-03-27 16:11:34 +11:00

umbraco.controls

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

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

Umbraco.Core

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

2014-04-23 20:45:02 +10:00

umbraco.datalayer

…

umbraco.editorControls

Replaced "retreive" with "retrieve".

2014-03-25 20:32:39 -07:00

umbraco.interfaces

…

umbraco.MacroEngines

Upgrade to Json.Net 6.0.2

2014-04-08 11:37:40 +02:00

umbraco.macroRenderings

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

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

Umbraco.MSBuild.Tasks

…

umbraco.providers

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

2014-03-18 18:53:04 +11:00

Umbraco.Tests

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

2014-04-23 20:45:02 +10:00

Umbraco.Web

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

2014-04-23 20:45:02 +10:00

Umbraco.Web.UI

Merge pull request #359 from Jeavon/7.1.2-ImageCropper

2014-04-23 20:20:09 +10:00

Umbraco.Web.UI.Client

Update README.md

2014-04-21 19:32:36 +10:00

UmbracoExamine

Fixes: U4-459 Public Access permissions not set on distributed servers

2014-03-27 16:11:34 +11:00

UmbracoExamine.Azure

…

UmbracoExamine.PDF

…

UmbracoExamine.PDF.Azure

…

WebPi

Update for WebPI

2014-04-09 09:35:02 +02:00

SolutionInfo.cs

…

Umbraco.MSBuild.Tasks.sln

…

umbraco.presentation.targets

…

umbraco.sln

…

umbraco.sln.DotSettings

…

umbraco.vssscc

…