Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/usermanager-object-cleanup

# Conflicts: # src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs # src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
2020-12-04 01:44:01 +11:00
parent 35af86c3d3 d711bce5ef
commit 0825db6861
2 changed files with 3 additions and 4 deletions
--- a/src/Umbraco.Web.Common/Security/UmbracoUserManager.cs
+++ b/src/Umbraco.Web.Common/Security/UmbracoUserManager.cs
@@ -12,7 +12,6 @@ using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Security;
 using Umbraco.Net;

-
 namespace Umbraco.Web.Common.Security
 {