Merge branch 'v10/dev' into v13/dev
# Conflicts: # src/Directory.Packages.props # src/Umbraco.Infrastructure/Manifest/ManifestParser.cs
This commit is contained in:
# Conflicts: # src/Directory.Packages.props # src/Umbraco.Infrastructure/Manifest/ManifestParser.cs