Merge branch 'v7/dev' into v8/dev
# Conflicts: # src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
This commit is contained in:
# Conflicts: # src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html