yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
This commit is contained in:
Bjarke Berg
2020-03-31 15:36:25 +02:00
parent ab57b633e0 d0938913e9
commit 55426515c0
123 changed files with 2578 additions and 1048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests/Models/ImageProcessorImageUrlGeneratorTest.cs
View File

@@ -16,10 +16,10 @@ using Umbraco.Core.PropertyEditors.ValueConverters;
using Umbraco.Core.Services;
using Umbraco.Tests.Components;
using Umbraco.Tests.TestHelpers;
using Umbraco.Web.Models;
using Umbraco.Web;
using Umbraco.Web.PropertyEditors;
using System.Text;
using Umbraco.Infrastructure.Media;
namespace Umbraco.Tests.Models
{