Merge conflicts resolved

2020-08-06 12:59:21 +02:00
parent 1cca4b50aa 9ac3885488
commit 39162f0f6a
235 changed files with 29349 additions and 4064 deletions
--- a/src/Umbraco.Core/Models/ContentEditing/ContentItemSave.cs
+++ b/src/Umbraco.Core/Models/ContentEditing/ContentItemSave.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Models.ContentEditing
    [DataContract(Name = "content", Namespace = "")]
    public class ContentItemSave : IContentSave<IContent>
    {
-        protected ContentItemSave()
+        public ContentItemSave()
        {
            UploadedFiles = new List<ContentPropertyFile>();
            Variants = new List<ContentVariantSave>();