Bjarke Berg
|
1ea39f2762
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
# src/Umbraco.Core/Models/PublishedContent/PublishedContentBase.cs
# src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
# src/Umbraco.Core/Packaging/ConflictingPackageData.cs
# src/Umbraco.Core/Packaging/PackagesRepository.cs
# src/Umbraco.Core/PublishedCache/PublishedMember.cs
# src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MacroRepository.cs
# src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs
# src/Umbraco.PublishedCache.NuCache/PublishedContent.cs
# src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
# src/Umbraco.Tests/PublishedContent/SolidPublishedSnapshot.cs
# src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/MediaTypeTreeController.cs
|
2020-03-02 08:34:52 +01:00 |
|