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

# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs

2020-01-21 10:51:04 +01:00

..

Azure

Merge branch 'dev-v7' into temp8

2019-01-11 10:23:27 +01:00

NuSpecs

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

2020-01-21 10:51:04 +01:00

build-bootstrap.ps1

Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00

build.ps1

Remove the cleanup code of LESS Source Map files from the ZIP & Nupkg builds - this is done with Niels PR as only gulp dev creates LESS SourceMaps

2019-12-06 09:27:35 +00:00