Bjarke Berg 280518c9d6 Merge remote-tracking branch 'origin/v11/dev' into v12/dev ...

# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Cms.ManagementApi/Umbraco.Cms.ManagementApi.csproj
#	src/Umbraco.Infrastructure/Logging/Viewer/LogViewerConfig.cs
#	src/Umbraco.Web.UI.Client/.nvmrc
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json

2023-11-28 09:39:31 +01:00

..

.template.config

Update default UmbracoVersion template value using MSBuild target (#13481)

2023-04-05 11:16:43 +02:00

Properties

Move templates to root

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

.gitignore

Simplify JSON schema, generation, copying and updating (#13427)

2022-11-22 12:48:11 +01:00

appsettings.Development.json

Simplify JSON schema, generation, copying and updating (#13427)

2022-11-22 12:48:11 +01:00

appsettings.json

Add config to limit concurrent logins (#14967)

2023-10-17 10:23:52 +02:00

UmbracoProject.csproj

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

2023-11-27 19:47:24 +01:00