Commit Graph

3 Commits

Author SHA1 Message Date
Bjarke Berg
3c622905ba Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
2020-05-11 08:23:59 +02:00
Bjarke Berg
68e3fe275a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB4549-Move-models-from-web
# Conflicts:
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/PackageInstallController.cs
2020-01-21 11:05:48 +01:00
Bjarke Berg
3279098f02 AB4549 - Moved mappers 2020-01-20 15:48:03 +01:00