Shannon ba1d546579 Merge remote-tracking branch 'origin/master-v7' into dev-v7 ...

Conflicts:
	src/Umbraco.Core/MainDom.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	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

2015-07-15 14:58:19 +02:00

..

build

Bump version

2014-05-28 17:07:51 +02:00

tools

Bugfix xdt upgrade to 7.3

2015-06-09 12:22:08 +02:00

UmbracoCms.Core.nuspec

Merge remote-tracking branch 'origin/master-v7' into dev-v7

2015-07-15 14:58:19 +02:00

UmbracoCms.nuspec

Show different ReadMe for fresh install vs. upgrade installs

2015-04-23 16:01:23 +02:00