Files
Umbraco-CMS/src/Umbraco.Infrastructure/Models
Bjarke Berg fe36c80ba0 Merge remote-tracking branch 'origin/v8/dev' into v9/dev
# Conflicts:
#	src/Umbraco.Core/Cache/UserGroupCacheRefresher.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/RepositoryCacheKeys.cs
#	src/Umbraco.Core/PropertyEditors/MediaPickerWithCropsValueConverter.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileExtensionConfigItem.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfiguration.cs
#	src/Umbraco.Core/PropertyEditors/Validators/FileUploadConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfig.cs
#	src/Umbraco.Core/PropertyEditors/Validators/IFileExtensionConfigItem.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3Configuration.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3ConfigurationEditor.cs
#	src/Umbraco.Core/PropertyEditors/Validators/MediaPicker3PropertyEditor.cs
#	src/Umbraco.Infrastructure/Cache/DefaultRepositoryCachePolicy.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/JsonValueConverter.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
#	src/Umbraco.Tests/Composing/TypeLoaderTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
#	src/Umbraco.Tests/Services/MediaServiceTests.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.Common/Extensions/FriendlyImageCropperTemplateExtensions.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	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/Cache/MemberCacheRefresher.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
2021-05-11 12:33:31 +02:00
..