Sebastien Ros d0b364c28e Merge branch '1.9.x' into dev ... Conflicts: src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj src/Orchard.Web/Core/Reports/Module.txt src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/AzureBlobShellSettingsManager.cs src/Orchard.Web/Modules/Orchard.Azure/Services/Environment/Configuration/DefaultPlatformConfigurationAccessor.cs src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs src/Orchard.Web/Modules/Orchard.Layouts/Elements/Column.cs src/Orchard.Web/Modules/Orchard.Layouts/Module.txt src/Orchard.Web/Web.config		2015-09-30 15:57:34 -07:00
..
Config	Merge branch '1.9.x' into dev	2015-09-30 15:57:34 -07:00
Properties	Set build version (1.2.41) for v1.2.	2011-06-13 12:34:42 -07:00
Global.asax	Azure packaging	2010-05-07 12:41:37 -07:00
Global.asax.cs	Cleaned up and fixed a couple of errors in Orchard.Web.csproj.	2013-08-30 12:13:15 -07:00
Orchard.Azure.Web.csproj	Updating to Azure SDK 2.7	2015-09-30 15:50:05 -07:00
Refresh.html	Adding static root files to Azure solution	2010-10-13 11:46:42 -07:00
Web.config	Updating to Azure SDK 2.7	2015-09-30 15:50:05 -07:00
Web.Debug.config	Cleaned up and fixed a couple of errors in Orchard.Web.csproj.	2013-08-30 12:13:15 -07:00
Web.Release.config	Added removal of 30 minute transaction timeout for debugging purposes to the release-mode Web.config transforms. Cleaned up the formatting of Web.config files.	2013-12-09 20:20:49 +01:00