Merge branch 'temp7-269-xss-stylesheets' of https://github.com/umbraco/Umbraco-CMS into temp7-269-xss-stylesheets

# Conflicts: # src/Umbraco.Core/StringExtensions.cs
2018-12-10 11:00:31 +01:00
parent 9edafe37e1 914d956ada
commit 8518aaf4c1
1 changed files with 0 additions and 1 deletions
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -189,7 +189,6 @@ namespace Umbraco.Core
                outputArray[i] = char.IsLetterOrDigit(inputArray[i]) ? inputArray[i] : replacement;
            return new string(outputArray);
        }
-
        private static readonly char[] CleanForXssChars = "*?(){}[];:%<>/\\|&'\"".ToCharArray();

        /// <summary>