Bjarke Berg
|
761c7dcfc6
|
Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
# build/NuSpecs/UmbracoCms.Web.nuspec
# src/Umbraco.Core/Dashboards/DashboardCollectionBuilder.cs
# src/Umbraco.Examine/Umbraco.Examine.csproj
# src/Umbraco.Examine/UmbracoExamineIndex.cs
# src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
# src/Umbraco.TestData/LoadTestController.cs
# src/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs
# src/Umbraco.Web.UI.Client/package-lock.json
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Editors/KeepAliveController.cs
# src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs
|
2021-05-21 12:32:39 +02:00 |
|