-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit 351c37a
committed
Merge remote-tracking branch 'remotes/origin/v8/dev' into v9/dev
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Models/ContentVersionMeta.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/DocumentVersionRepository.cs
# src/Umbraco.Core/Services/Implement/ContentService.cs
# src/Umbraco.Core/Services/Implement/DefaultContentVersionCleanupPolicy.cs
# src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
# src/Umbraco.Tests/Persistence/Repositories/DocumentVersionRepository_Tests_Integration.cs
# src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_UnitTests.cs
# src/Umbraco.Tests/Services/DefaultContentVersionCleanupPolicy_Tests_UnitTests.cs
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web/Cache/DistributedCacheBinder.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Umbraco.Web.csprojFile tree
Expand file treeCollapse file tree
0 file changed
+0
-0
lines changedFilter options
Expand file treeCollapse file tree
0 file changed
+0
-0
lines changed
0 commit comments