Bjarke Berg 09b480919b Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev ...

# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config

2020-01-07 07:35:34 +01:00

..

config

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

2020-01-07 07:35:34 +01:00

Content

…

Media

…

Properties

Revert "Temp8 tinymce"

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

Umbraco

Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure

2020-01-06 14:59:17 +01:00

Views

Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure

2020-01-06 14:59:17 +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 pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure

2020-01-06 14:59:17 +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

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.Release.config

Revert "Temp8 tinymce"

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