Merge branch 'patch-7.13.2' into dev-v7
# Conflicts: # src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
This commit is contained in:
# Conflicts: # src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js