Bjarke Berg
d14e2a99bc
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# .gitignore
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/ContentExtensions.cs
# src/Umbraco.Infrastructure/Intall/InstallHelper.cs
# src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
# src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
# src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
# src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
# src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
2020-09-09 14:16:46 +02:00
..
2018-08-29 10:49:55 +10:00
2020-09-09 14:16:46 +02:00
2019-07-01 11:53:22 +01:00
2019-10-29 14:28:54 +01:00
2020-08-25 14:00:59 +02:00