Merge remote-tracking branch 'origin/dev-v7' into temp8

# Conflicts: # src/Umbraco.Core/StringExtensions.cs # src/Umbraco.Web/UI/LegacyDialogHandler.cs # src/Umbraco.Web/WebServices/SaveFileController.cs
2019-01-04 11:30:51 +01:00
parent f69cb89e30 08e13ac530
commit 9821901717
2 changed files with 11 additions and 1 deletions
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -187,7 +187,6 @@ namespace Umbraco.Core
                outputArray[i] = char.IsLetterOrDigit(inputArray[i]) ? inputArray[i] : replacement;
            return new string(outputArray);
        }
-
        private static readonly char[] CleanForXssChars = "*?(){}[];:%<>/\\|&'\"".ToCharArray();

        /// <summary>