Umbraco-CMS

Files

Bjarke Berg 6e89e9a8a9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB10314-mb-embedded-dependencies

# Conflicts:
#	src/Umbraco.Infrastructure/ModelsBuilder/ApiVersion.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/Builder.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/ModelsGenerator.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/PropertyModel.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TextBuilder.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TextHeaderWriter.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModel.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/Building/TypeModelHasher.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/LiveModelsProvider.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderAssemblyAttribute.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsBuilderDashboard.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/ModelsGenerationError.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/OutOfDateModelsStatus.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedElementExtensions.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/PublishedModelUtility.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/RoslynCompiler.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/TypeExtensions.cs
#	src/Umbraco.Infrastructure/ModelsBuilder/UmbracoServices.cs
#	src/Umbraco.ModelsBuilder.Embedded/ImplementPropertyTypeAttribute.cs
#	src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
#	src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ContentTypeModelValidatorBase.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/DashboardReport.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/DisableModelsBuilderNotificationHandler.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/MediaTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/MemberTypeModelValidator.cs
#	src/Umbraco.Web.BackOffice/ModelsBuilder/ModelsBuilderDashboardController.cs
#	src/Umbraco.Web.Common/ModelsBuilder/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/ModelsBuilder/ModelsBuilderNotificationHandler.cs
#	src/Umbraco.Web.Common/ModelsBuilder/PureLiveModelFactory.cs
#	src/Umbraco.Web.Common/ModelsBuilder/RefreshingRazorViewEngine.cs
#	src/Umbraco.Web.Common/ModelsBuilder/UmbracoAssemblyLoadContext.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs

2021-02-22 09:00:33 +01:00

BackOfficeTours

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB10314-mb-embedded-dependencies

2021-02-22 09:00:33 +01:00

lang

added files that are renamed with casing only

2020-07-04 17:39:44 +02:00

grid.editors.config.js

added files that are renamed with casing only

2020-07-04 17:39:44 +02:00

logviewer.searches.config.js

added files that are renamed with casing only