Sebastiaan Janssen
|
30f8885aa9
|
Merge branch 'u4-9983' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9983
# Conflicts:
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
# src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
|
2018-04-12 17:59:11 +02:00 |
|