lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 03:40:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.9.3' into 1.10

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
	src/Orchard.Web/Web.config
This commit is contained in:
Sebastien Ros
2016-02-01 10:12:06 -08:00
parent 52aade5411 c890f5b5c6
commit b3b4b38229
153 changed files with 236 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Web.config
View File

@@ -103,7 +103,7 @@
<modules runAllManagedModulesForAllRequests="false">
<remove name="OutputCache" />
<remove name="WarmupHttpModule" />
<add name="WarmupHttpModule" type="Orchard.WarmupStarter.WarmupHttpModule, Orchard.WarmupStarter, Version=1.9.2, Culture=neutral" />
<add name="WarmupHttpModule" type="Orchard.WarmupStarter.WarmupHttpModule, Orchard.WarmupStarter, Version=1.9.3, Culture=neutral"/>
</modules>
<handlers accessPolicy="Script">
<!-- Clear all handlers, prevents executing code file extensions or returning any file contents. -->