Shannon 8574c6b7d0 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 ...

Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs

2014-03-13 14:12:45 +11:00

1.5 KiB

Raw Blame History

View Raw