Shannon
|
1658fced23
|
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/booting-netcore
# Conflicts:
# src/Umbraco.Core/IO/IOHelper.cs
# src/Umbraco.Infrastructure/Runtime/WebRuntime.cs
# src/Umbraco.Tests.Common/TestHelperBase.cs
# src/Umbraco.Tests/Routing/RenderRouteHandlerTests.cs
# src/Umbraco.Tests/Runtimes/StandaloneTests.cs
# src/Umbraco.Web.BackOffice/AspNetCore/UmbracoBackOfficeServiceCollectionExtensions.cs
# src/Umbraco.Web.UI.NetCore/Program.cs
# src/Umbraco.Web.UI.NetCore/Startup.cs
# src/Umbraco.Web/UmbracoApplication.cs
|
2020-03-23 15:50:01 +11:00 |
|