Benjamin Carleski
|
bcd26b9243
|
Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev
# Conflicts:
# src/Umbraco.Abstractions/IImageUrlGenerator.cs
# src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
# src/Umbraco.Core/Composing/Current.cs
# src/Umbraco.Core/Models/UserExtensions.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Tests/Runtimes/StandaloneTests.cs
# src/Umbraco.Tests/Testing/UmbracoTestBase.cs
# src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
# src/Umbraco.Web/Runtime/WebInitialComposer.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
|
2020-02-11 16:53:13 -08:00 |
|