Bjarke Berg
|
1bfb64bdd8
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Abstractions/Constants-AppSettings.cs
# src/Umbraco.Abstractions/ContentVariationExtensions.cs
# src/Umbraco.Abstractions/IMainDom.cs
# src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
# src/Umbraco.Abstractions/Runtime/IMainDom.cs
# src/Umbraco.Abstractions/Runtime/MainDom.cs
# src/Umbraco.Core/IMainDom.cs
# src/Umbraco.Core/MainDom.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Infrastructure/MainDom.cs
# src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
# src/Umbraco.Web/UmbracoApplication.cs
# src/Umbraco.Web/UmbracoComponentRenderer.cs
|
2020-01-23 13:16:49 +01:00 |
|