Niels Lyngsø 678ceba1a8 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB6057-segment-feature ...

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js

2020-04-27 12:58:29 +02:00

..

config

Add missing documentation for web.routing in umbracoSettings.config (#7468)

2020-01-29 16:54:56 +00:00

Content

…

Media

…

Properties

Revert "Temp8 tinymce"

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

Umbraco

Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB6057-segment-feature

2020-04-27 12:58:29 +02:00

Views

Remove Empty Statements

2020-02-12 15:11:18 +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

fixes merge issue

2020-04-17 13:20:57 +10:00

web.Template.config

restores the MB enable flag

2019-10-29 11:02:18 +11:00

web.Template.Debug.config

Adds TestData project along with test endpoints for enabling/disabling segments

2020-01-21 13:33:39 +11:00

web.Template.Release.config

Revert "Temp8 tinymce"

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