Shannon
0f503fc320
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
src/Umbraco.Core/Services/PackagingService.cs
src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
src/Umbraco.Tests/Services/Importing/ImportResources.resx
src/Umbraco.Tests/Services/Importing/PackageImportTests.cs
src/Umbraco.Tests/Services/PackagingServiceTests.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/config/ClientDependency.config
src/Umbraco.Web/Umbraco.Web.csproj
src/umbraco.cms/businesslogic/Packager/Installer.cs
src/umbraco.cms/businesslogic/workflow/Notification.cs
src/umbraco.macroRenderings/umbraco.macroRenderings.csproj