Shannon 26b70a4a4e Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 ...

Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml

2015-12-15 10:40:52 +01:00

..

ApiDocs

…

NuSpecs

…

Build.bat

…

Build.proj

…

BuildBelle.bat

…

BuildDocs.ps1

…

InstallGit.cmd

…

ReplaceIISExpressPortNumber.exe

…

RevertToCleanInstall.bat

…

RevertToEmptyInstall.bat

…

UmbracoVersion.txt

…