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

Browse Source

Conflicts:
	build/Build.proj
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	build/NuSpecs/tools/install.ps1
	src/Umbraco.Web.UI/umbraco_client/Editors/EditScript.js

...

This commit is contained in:

Shannon

2014-03-26 15:06:03 +11:00

parent 10b544abb9 cde3c42cec

commit 1cbaace777

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available