Merge branch 'u4-11502' of https://github.com/AndyButland/Umbraco-CMS into temp8-11502

2018-07-18 11:13:22 +02:00
parent 6c526b24a0 91a0ee2c93
commit b5dc538905
30 changed files with 832 additions and 222 deletions
--- a/src/Umbraco.Web/Models/ContentEditing/Language.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/Language.cs
@@ -24,5 +24,8 @@ namespace Umbraco.Web.Models.ContentEditing

        [DataMember(Name = "isMandatory")]
        public bool Mandatory { get; set; }
+
+        [DataMember(Name = "fallbackLanguageId")]
+        public int? FallbackLanguageId { get; set; }
    }
 }