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

Conflicts:
	src/Umbraco.Web.UI/web.Template.config
This commit is contained in:
Shannon
2016-01-13 17:18:30 +01:00
8 changed files with 102 additions and 9 deletions

View File

@@ -79,7 +79,7 @@
<system.web>
<customErrors mode="RemoteOnly" />
<trace enabled="true" requestLimit="10" pageOutput="false" traceMode="SortByTime" localOnly="true" />
<httpRuntime requestValidationMode="2.0" enableVersionHeader="false" targetFramework="4.5" maxRequestLength="1048576" />
<httpRuntime requestValidationMode="2.0" enableVersionHeader="false" targetFramework="4.5" maxRequestLength="1048576" fcnMode="Single" />
<!--
If you are deploying to a cloud environment that has multiple web server instances,
you should change session state mode from "InProc" to "Custom". In addition,