Files
Umbraco-CMS/.gitignore
Emma Garland fa1499333f Merge branch 'netcore/dev' into netcore/members-roles-save
# Conflicts:
#	.gitignore
#	src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberIdentityUserManagerTests.cs
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
#	src/Umbraco.Web.Common/Security/MemberManager.cs
2021-03-16 17:48:40 +00:00

5.5 KiB