Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent
Conflicts: src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
This commit is contained in:
@@ -21,7 +21,6 @@ using Umbraco.Core.Persistence.UnitOfWork;
|
||||
using Umbraco.Core.PropertyEditors;
|
||||
using Umbraco.Core.Publishing;
|
||||
using Umbraco.Core.Services;
|
||||
using Umbraco.Tests.Stubs;
|
||||
using Umbraco.Web;
|
||||
using Umbraco.Web.PublishedCache;
|
||||
using Umbraco.Web.PublishedCache.XmlPublishedCache;
|
||||
|
||||
Reference in New Issue
Block a user