Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6

This commit is contained in:
Warren Buckley
2017-03-14 10:18:00 +00:00

View File

@@ -340,7 +340,17 @@
<requestLimits maxAllowedContentLength="52428800" />
</requestFiltering>
</security>
<!--
If you wish to use IIS rewrite rules, see the documentation here:
https://our.umbraco.org/documentation/Reference/Routing/IISRewriteRules
-->
<!--
<rewrite>
<rules></rules>
</rewrite>
-->
</system.webServer>
<runtime>
@@ -442,16 +452,5 @@
<caching configSource="config\imageprocessor\cache.config" />
<processing configSource="config\imageprocessor\processing.config" />
</imageProcessor>
<!--
If you wish to use IIS rewrite rules, see the documentation here:
https://our.umbraco.org/documentation/Reference/Routing/IISRewriteRules
-->
<!--
<rewrite>
<rules></rules>
</rewrite>
-->
</configuration>