Bjarke Berg 962c1a1a5b Merge branch 'v10/dev' into v11/dev ...

# Conflicts:
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/prevalue/blockgrid.blockconfiguration.overlay.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umbblockgridentries.component.js
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Branding/logo.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/macro.spec.ts
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/templates.spec.ts

2022-12-06 12:53:37 +01:00

..

Umbraco.TestData

v11: Merge v10/feature/project-cleanup into v11/dev (#13112)

2022-10-05 12:14:43 +02:00

Umbraco.Tests.AcceptanceTest

Merge branch 'v10/dev' into v11/dev

2022-12-06 12:53:37 +01:00

Umbraco.Tests.Benchmarks

Updated to aspnetcore 7.0.0 (#13372)

2022-11-09 09:33:22 +01:00

Umbraco.Tests.Common

Obsolete old migrations and exif code (#13382)

2022-11-14 12:40:22 +01:00

Umbraco.Tests.Integration

Nuget updates (#13478)

2022-11-29 14:16:49 +01:00

Umbraco.Tests.UnitTests

Merge branch 'v10/dev' into v11/dev

2022-12-06 12:53:37 +01:00

.editorconfig

Fix smidge bundles not always invalidated between backoffice versions. (#11700)

2021-12-02 11:32:19 +01:00

codeanalysis.ruleset

…

Directory.Build.props

v10: Cleanup project files (#13111)

2022-10-05 12:11:51 +02:00