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

# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/packages.config
#	src/UmbracoExamine/UmbracoExamine.csproj
#	src/umbraco.MacroEngines/packages.config
#	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj

2017-03-30 17:03:51 +11:00

..

build

U4-6171 Continuous Deployment from Visual Studio Online to Azure Websites not working as expected

2015-10-29 16:07:07 +01:00

tools

Merge pull request #1828 from umbraco/temp-u4-9655

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

UmbracoCms.Core.nuspec

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

2017-03-30 17:03:51 +11:00

UmbracoCms.nuspec

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

2017-02-09 13:20:33 +11:00