Shannon 1f3e568a0d fixes merge issues

2017-03-29 19:11:55 +11:00

..

.nuget

…

SQLCE4Umbraco

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

umbraco.businesslogic

Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6

2017-03-14 17:25:40 +11:00

umbraco.cms

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6

2017-03-29 18:11:51 +11:00

umbraco.controls

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

Umbraco.Core

fixes merge issues

2017-03-29 19:11:55 +11:00

umbraco.datalayer

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

umbraco.editorControls

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

umbraco.interfaces

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

umbraco.MacroEngines

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

Umbraco.MSBuild.Tasks

…

umbraco.providers

deploy-257 Downgrade Core and Deploy to framework 4.5

2017-03-08 11:20:48 +01:00

Umbraco.Tests

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6

2017-03-29 18:11:51 +11:00

Umbraco.Tests.Benchmarks

Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6

2017-03-10 10:40:28 +01:00

Umbraco.Web

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6

2017-03-29 18:11:51 +11:00

Umbraco.Web.UI

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6

2017-03-29 18:11:51 +11:00

Umbraco.Web.UI.Client

Merge pull request #1838 from umbraco/temp-u4-9665

2017-03-29 18:06:28 +11:00

UmbracoExamine

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6

2017-03-29 18:11:51 +11:00

WebPi

…

NuGet.Config

…

SolutionInfo.cs

bumps version

2017-03-29 16:35:37 +11:00

Umbraco.MSBuild.Tasks.sln

…

umbraco.presentation.targets

…

umbraco.sln

…

umbraco.sln.DotSettings

…

umbraco.vssscc

…