Merge branch '1.8.x' into 1.x

Conflicts:
	src/Orchard.Web/Web.config
This commit is contained in:
Sebastien Ros
2014-07-31 17:44:16 -07:00
31 changed files with 168 additions and 95 deletions

View File

@@ -100,7 +100,7 @@
<modules runAllManagedModulesForAllRequests="false">
<remove name="WarmupHttpModule"/>
<add name="WarmupHttpModule" type="Orchard.WarmupStarter.WarmupHttpModule, Orchard.WarmupStarter, Version=1.8, Culture=neutral"/>
<add name="WarmupHttpModule" type="Orchard.WarmupStarter.WarmupHttpModule, Orchard.WarmupStarter, Version=1.8.1, Culture=neutral"/>
</modules>
<handlers accessPolicy="Script">