yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v8/dev' into netcore/merge_umbraco_id_into_netcore_dev

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/V_8_8_0/ExternalLoginTableUserData.cs
#	src/Umbraco.Core/Migrations/Upgrade/V_8_9_0/ExternalLoginTableUserData.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_8_0/ExternalLoginTableUserData.cs
#	src/Umbraco.Web/Services/IconService.cs
This commit is contained in:
Bjarke Berg
2020-10-21 09:07:30 +02:00
parent d31fbdf7bb 6475684d9e
commit 85718e9b86
25 changed files with 178 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.ModelsBuilder.Embedded/Compose/DisabledModelsBuilderComponent.cs
View File

@@ -8,7 +8,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose
/// <summary>
/// Special component used for when MB is disabled with the legacy MB is detected
/// </summary>
internal class DisabledModelsBuilderComponent : IComponent
public sealed class DisabledModelsBuilderComponent : IComponent
{
private readonly UmbracoFeatures _features;