2 Commits

Author	SHA1	Message	Date
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
Shannon	8cc78631a0	Adds TestData project along with test endpoints for enabling/disabling segments	2020-01-21 13:33:39 +11:00