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

# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.PublishedCache.NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web/Models/Trees/MenuItemList.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Trees/RelationTypeTreeController.cs
#	src/Umbraco.Web/UmbracoApplication.cs

2020-05-29 12:59:42 +02:00

..

config

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

2020-05-29 12:59:42 +02: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-05-29 12:59:42 +02:00

Views

Fix views

2020-04-01 11:31:21 +02: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 'Umbraco/netcore/dev' into netcore/feature/users

2020-04-22 15:58:54 +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