Files
Orchard/src/Orchard.WarmupStarter
Sebastien Ros 6c0b85ad74 Merge branch 'master' into 1.x
Conflicts:
	ClickToBuildAzurePackage.cmd
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
	src/Orchard.Web/Modules/SysCache/Web.config
	src/Orchard.Web/Orchard.Web.csproj
2013-11-11 18:11:53 -08:00
..
2013-11-08 16:53:03 -08:00