Merge remote-tracking branch 'origin/dev-v7' into temp-CON-1267

Browse Source

# Conflicts:
#	src/Umbraco.Core/Exceptions/ConnectionException.cs
#	src/Umbraco.Core/Services/PackagingService.cs
#	src/Umbraco.Web/Editors/PackageInstallController.cs

...

This commit is contained in:

Shannon

2017-04-27 13:27:23 +10:00

parent e913034d93 bed5f8a03b

commit 736798c769

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available