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/AB4919-untable-umbraco-context

Browse Source 
# Conflicts:
#	src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
#	src/Umbraco.Web/Macros/MacroRenderer.cs
This commit is contained in:
Bjarke Berg
2020-02-11 10:30:41 +01:00
parent 4d15c8c044 9449ed9a4d
commit ec1d829a3e
67 changed files with 920 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Tests/TestHelpers/ControllerTesting/TestControllerActivatorBase.cs
View File

@@ -11,6 +11,7 @@ using Moq;
using Umbraco.Core.Cache;
using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.Dictionary;
using Umbraco.Core.IO;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Security;