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

..

ServiceCollectionExtensions.cs

Corrected formatting and removed unwanted commented out code

2021-03-08 17:26:53 +00:00

StaticServiceProvider.cs

Update src/Umbraco.Web.Common/DependencyInjection/StaticServiceProvider.cs

2021-03-12 11:48:23 +01:00

UmbracoBuilderExtensions.cs

Merge branch 'netcore/bug/minify-plugins' of https://github.com/kjac/Umbraco-CMS into kjac-netcore/bug/minify-plugins

2021-03-16 17:22:25 +11:00

UmbracoStartupFilter.cs

Fix Deserialization of defaultConfig from package.manifest

2021-03-10 21:13:13 +01:00

UmbracoStartupFilterOptions.cs

Error handling issue fix

2021-03-10 12:50:27 +01:00