Shannon
3c771648e3
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/Umbraco.Core/Models/Member.cs
src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
src/Umbraco.Web/Models/ProfileModel.cs
src/Umbraco.Web/Models/UmbracoProperty.cs
src/Umbraco.Web/Security/MembershipHelper.cs
src/Umbraco.Web/UmbracoHelper.cs
2014-03-11 14:47:00 +11:00
..
2014-03-06 20:22:32 +11:00
2013-09-16 17:17:45 +02:00
2013-09-16 17:17:45 +02:00
2013-04-10 14:02:16 -02:00
2013-04-10 14:02:16 -02:00
2013-09-16 17:17:38 +02:00
2013-04-04 05:10:53 -02:00
2014-03-05 15:46:37 +01:00
2013-04-10 14:02:16 -02:00
2014-03-11 14:35:49 +11:00
2013-04-04 05:10:53 -02:00
2013-09-16 17:17:45 +02:00
2014-03-11 14:23:51 +11:00