Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

2013-10-30 19:35:02 +01:00
parent ce509638e1 ed80f75c1c
commit 81d2aac0d2
15 changed files with 279 additions and 16 deletions
--- a/src/Umbraco.Core/Constants-PropertyEditors.cs
+++ b/src/Umbraco.Core/Constants-PropertyEditors.cs
@@ -197,6 +197,11 @@ namespace Umbraco.Core
            /// </summary>
            public const string MemberPickerAlias = "Umbraco.MemberPicker";

+            /// <summary>
+            /// Alias for the Member Group Picker datatype.
+            /// </summary>
+            public const string MemberGroupPickerAlias = "Umbraco.MemberGroupPicker";
+
            /// <summary>
            /// Guid for the Multi-Node Tree Picker datatype
            /// </summary>