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

Browse Source

Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Web/umbraco.presentation/library.cs

...

This commit is contained in:

Shannon

2013-12-10 12:59:29 +11:00

parent a6b3233c10 c5047148b3

commit 1d9c3b1a79

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