Bjarke Berg 74c45ee60d Merge remote-tracking branch 'origin/v10/dev' into v11/dev ...

# Conflicts:
#	src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs
#	src/Umbraco.Core/Models/Mapping/DictionaryMapDefinition.cs
#	src/Umbraco.Web.BackOffice/Install/InstallApiController.cs
#	version.json

2022-09-12 16:47:20 +02:00

..

UmbracoPackage

V11/feature/update to dotnet 7 (#12712)

2022-08-23 11:31:05 +02:00

UmbracoProject

Merge remote-tracking branch 'origin/v10/dev' into v11/dev

2022-09-12 16:47:20 +02:00

Directory.Build.props

Fix duplicate Directory.Build.props import

2022-08-26 09:19:55 +02:00

icon.png

Move templates to root

2022-04-12 11:00:59 +02:00

Umbraco.Templates.csproj

Merge remote-tracking branch 'origin/v10/dev' into v11/dev

2022-09-12 16:47:20 +02:00