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
..
2019-12-09 14:12:06 +01:00
2020-01-14 07:47:47 +01:00
2020-01-14 07:47:47 +01:00
2018-11-14 22:23:40 +11:00
2020-01-14 07:47:47 +01:00
2019-12-09 14:12:06 +01:00
2019-12-20 17:36:44 +01:00
2019-04-04 21:57:49 +11:00
2019-12-11 09:29:36 +01:00
2017-07-20 11:21:28 +02:00
2019-12-09 14:12:06 +01:00
2019-12-09 14:12:06 +01:00
2020-02-09 11:12:29 -08:00
2019-12-09 14:12:06 +01:00
2019-11-07 13:02:29 +01:00
2019-12-19 15:53:50 +01:00
2020-01-14 16:53:20 +01:00
2019-11-07 13:02:29 +01:00
2019-12-19 15:53:50 +01:00
2018-01-15 13:28:35 +01:00
2019-12-09 14:12:06 +01:00
2019-12-09 14:12:06 +01:00
2019-12-10 14:44:42 +01:00
2019-12-10 14:44:42 +01:00
2019-11-07 13:02:29 +01:00
2019-12-09 14:12:06 +01:00
2019-10-15 00:04:41 +11:00
2020-01-14 07:47:47 +01:00
2020-01-07 13:08:21 +01:00