Shannon
9a9237e78e
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
src/Umbraco.Core/Services/IMembershipUserService.cs
src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
src/Umbraco.Web.UI/config/trees.config
src/Umbraco.Web.UI/config/umbracoSettings.config
src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
src/Umbraco.Web/Search/ExamineEvents.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/content.cs
src/Umbraco.Web/umbraco.presentation/umbraco/cache/LegacyClasses.cs