Merge remote-tracking branch 'origin/v7/7.15' into v8/dev
# Conflicts: # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
This commit is contained in:
# Conflicts: # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js