Bjarke Berg 5dbddfffc5 Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore ...

# Conflicts:
#	.gitignore
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
#	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml

2020-12-07 12:31:26 +01:00

..

config

Post merge - Fix powershell build.ps1

2020-12-01 14:25:10 +01:00

Content

…

Media

…

Properties

…

Umbraco

Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore

2020-12-01 11:34:13 +01:00

Views

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

2020-11-30 11:24:24 +01:00

favicon.ico

…

Global.asax

…

Umbraco.Web.UI.csproj

Merge remote-tracking branch 'origin/v8/dev' into netcore/netcore

2020-12-07 12:31:26 +01:00

web.config.temp-build

Hardcode verion 9 in text, and change assembly versions to 0.5.0

2020-08-17 09:34:27 +02:00

web.Template.config

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

2020-11-12 09:13:53 +01:00

web.Template.Debug.config

Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

2020-06-28 12:48:19 +02:00

web.Template.Release.config

…