Merge temp8 into temp8-3675-variant-tags

2018-12-07 09:36:58 +01:00
parent 159ae136f3 fb4717d31e
commit c62d64a9b7
143 changed files with 6736 additions and 5613 deletions
--- a/src/Umbraco.Core/ObjectExtensions.cs
+++ b/src/Umbraco.Core/ObjectExtensions.cs
@@ -723,8 +723,8 @@ namespace Umbraco.Core
            {
                return typeConverter;
            }
-
-            TypeConverter converter = TypeDescriptor.GetConverter(target);
+            
+            var converter = TypeDescriptor.GetConverter(target);
            if (converter.CanConvertFrom(source))
            {
                return DestinationTypeConverterCache[key] = converter;