Shannon
|
6ad28f1103
|
Merge remote-tracking branch 'origin/v7/7.15' into v8/8.1
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Services/EntityService.cs
# src/Umbraco.Core/Services/IEntityService.cs
# src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs
# src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
# src/Umbraco.Web/Controllers/UmbProfileController.cs
# src/Umbraco.Web/Controllers/UmbRegisterController.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/Mvc/HttpUmbracoFormRouteStringException.cs
# src/Umbraco.Web/Mvc/ValidateUmbracoFormRouteStringAttribute.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebBootManager.cs
|
2019-07-17 21:58:33 +10:00 |
|