Umbraco-CMS

Files

Claus 9e3db051c9 Merge remote-tracking branch 'origin/temp8' into temp-U4-11218

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/googlemaps/googlemaps.html
#	src/Umbraco.Web.UI/web.Template.config

2018-05-17 08:26:02 +02:00

ApiDocs

Cleanup Solution

2018-05-16 15:46:51 +02:00

Umbraco.Core

Merge remote-tracking branch 'origin/temp8' into temp-U4-11218

2018-05-17 08:26:02 +02:00

Umbraco.Examine

Updates to 472 and re-targets to the original System.Threading.Tasks.Dataflow package against netstandard 1.3 but with 472 this completely fixes dependency outputs

2018-05-15 17:17:05 +02:00

Umbraco.Tests

Merge remote-tracking branch 'origin/temp8' into temp-U4-11218