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

Browse Source

Conflicts:
	src/umbraco.editorControls/MultiNodeTreePicker/MNTP_DataEditor.cs

...

This commit is contained in:

Shannon

2013-12-16 16:29:28 +11:00

parent fdc9261399 6a9b8d5540

commit b8f5d1c42c

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