Shannon
19851b6986
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/AddRelationTypeForMediaFolderOnDelete.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/IncreaseLanguageIsoCodeColumnLength.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/UpdateUmbracoConsent.cs
# src/Umbraco.Core/Persistence/PetaPoco.cs
# src/Umbraco.Core/PluginManager.cs
# src/Umbraco.Core/Services/Implement/UserService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
# src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
# src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
# src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs
# src/Umbraco.Web/Install/FilePermissionHelper.cs
# src/Umbraco.Web/Trees/PackagesTreeController.cs
# src/Umbraco.Web/UI/JavaScript/UmbracoClientDependencyLoader.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/umbraco.presentation/content.cs
# src/Umbraco.Web/umbraco.presentation/requestModule.cs
# src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
# src/umbraco.cms/businesslogic/Content.cs
# src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs
2018-08-01 12:26:26 +10:00
..
2018-06-29 19:52:40 +02:00
2018-08-01 12:26:26 +10:00
2016-05-27 12:48:38 +02:00