Merge branch 'dev-v7.9' into temp-U4-10900-2

# Conflicts: # src/Umbraco.Web.UI.Client/src/views/member/export.html
2018-02-26 23:13:58 +11:00
parent 15c803b975 22b9941822
commit 397ab0e979
4 changed files with 611 additions and 601 deletions
--- a/src/Umbraco.Core/Models/Consent.cs
+++ b/src/Umbraco.Core/Models/Consent.cs
@@ -97,6 +97,6 @@ namespace Umbraco.Core.Models
        /// <summary>
        /// Gets the previous states of this consent.
        /// </summary>
-        public List<IConsent> HistoryInternal { get; set; }
+        internal List<IConsent> HistoryInternal { get; set; }
    }
 }