yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/7.1.9' into 7.2.0

Browse Source 
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
This commit is contained in:
Shannon
2014-11-21 09:59:31 +11:00
parent d34255b1fc 2341622243
commit da87ba8bc7
6 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
View File

@@ -38,7 +38,7 @@ namespace Umbraco.Web.PropertyEditors
[PreValueField("startNode", "Node type", "treesource")]
public string StartNode { get; set; }
[PreValueField("filter", "Allow items of type", "textstring", Description = "Seperate with comma")]
[PreValueField("filter", "Allow items of type", "textstring", Description = "Separate with comma")]
public string Filter { get; set; }
[PreValueField("minNumber", "Minimum number of items", "number")]