Merge branch 'v7/dev' into v8/dev

Browse Source

# Conflicts:
#	src/Umbraco.Core/Services/NotificationService.cs
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web/Properties/Settings.settings
#	src/Umbraco.Web/Properties/Settings1.Designer.cs

...

This commit is contained in:

Sebastiaan Janssen

2019-08-13 22:11:34 +02:00

parent 02c1e88da2 7393d9c372

commit 9fa435dbb2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available