Resolved post-merge issues.

2020-08-27 09:27:11 +02:00
parent 2a59a8385c
commit e6ac534069
3 changed files with 8 additions and 0 deletions
--- a/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs
@@ -32,6 +32,8 @@

        public string Path { get; set; } = "~/umbraco";

+        public string IconsPath { get; set; } = $"~/umbraco/assets/icons";
+
        public string UmbracoCssPath { get; set; } = "~/css";

        public string UmbracoScriptsPath { get; set; } = "~/scripts";