Merge branch 'dev-v7' into dev-v8

Browse Source

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web/UmbracoHelper.cs

...

This commit is contained in:

Sebastiaan Janssen

2019-03-20 23:29:04 +01:00

parent 263ee5c297 1a4a3504d0

commit ee911a579f

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