Bjarke Berg a28168667b Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore ...

Signed-off-by: Bjarke Berg <mail@bergmania.dk>

# Conflicts:
#	src/Umbraco.Core/Editors/BackOfficePreviewModel.cs
#	src/Umbraco.Core/Models/IconModel.cs
#	src/Umbraco.Web.BackOffice/Controllers/IconController.cs
#	src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeModel.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs

2020-09-22 13:28:03 +02:00

..

config

Updated default config files

2020-08-24 14:15:53 +02:00

Properties

…

umbraco

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

2020-09-22 13:28:03 +02:00

Views

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

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

wwwroot

…

appsettings.Development.json

uncomment SMTP info by default

2020-09-22 08:01:04 +02:00

appsettings.json

Fixed wrong config file path

2020-09-18 07:05:40 +02:00

Program.cs

Netcore: Let build.ps1 create the dotnet new templates (#8591)

2020-08-11 08:28:16 +02:00

Startup.cs

Post merge fixes

2020-09-07 15:28:58 +02:00

Umbraco.Web.UI.NetCore.csproj

Post merge

2020-09-22 12:44:36 +02:00