Merge remote-tracking branch 'origin/temp8' into feature/IContentType-removale-from-IContent

# Conflicts: # src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
2019-02-01 12:52:20 +01:00
parent 8e597aabf3 0c34de4524
commit bfc2d53fa4
1566 changed files with 18277 additions and 26409 deletions
--- a/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
+++ b/src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
@@ -403,7 +403,7 @@ namespace Umbraco.Tests.Web.Controllers
            Assert.IsTrue(display.Errors.ContainsKey("_content_variant_en-US_"));
        }

-        //TODO: There are SOOOOO many more tests we should write - a lot of them to do with validation
+        // TODO: There are SOOOOO many more tests we should write - a lot of them to do with validation

    }
 }