Merge branch 'temp8' of https://github.com/StefanoChiodino/Umbraco-CMS into temp8-pr3583

2019-01-10 16:29:36 +01:00
parent 4700d8a69c e2455b14d9
commit ed7c8da81f
29 changed files with 130 additions and 126 deletions
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
@@ -109,7 +109,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
            }
        }

-        public override int TemplateId
+        public override int? TemplateId
        {
            get
            {