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

..

config

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

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

Content

…

Media

…

Properties

Revert "Temp8 tinymce"

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

Umbraco

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

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

Views

7368 - Updated view to use the new name of ReplaceLineBreaksForHtml

2020-01-21 09:01:11 +01:00

favicon.ico

Merge branch 'v7/dev' into v8/dev

2019-04-17 14:35:59 +02:00

Global.asax

Revert "Temp8 tinymce"

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

Umbraco.Web.UI.csproj

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

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

web.Template.config

kill user membership provider, adds some passwords api abstractions, moves membership provider logic out of Core/services, removes membership scenario and other membership code we don't want anymore.

2019-11-25 21:20:00 +11:00

web.Template.Debug.config

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

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

web.Template.Release.config

Revert "Temp8 tinymce"

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