Orchard

mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-09 11:21:04 +08:00

Go to file

Sebastien Ros f6f6a56c24 Merge branch 'feature/fw45' into 1.x

Conflicts:
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Autoroute/Specs/Orchard.Autoroute.Specs.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
	src/Orchard.Web/Modules/Orchard.Azure/Web.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/App.config
	src/Orchard.Web/Modules/Orchard.Fields/Specs/Orchard.Fields.Specs.csproj
	src/Orchard.Web/Modules/Orchard.OutputCache/Scripts/Web.config
	src/Orchard.Web/Modules/Orchard.Taxonomies/Styles/Web.config
	src/Orchard.Web/Orchard.Web.csproj
	src/Orchard.Web/Web.config

2013-10-11 16:40:44 -07:00

lib

Patching the nhibernate build

2013-09-24 10:32:58 -07:00

src

Merge branch 'feature/fw45' into 1.x

2013-10-11 16:40:44 -07:00

.gitignore

Patching the nhibernate build

2013-09-24 10:32:58 -07:00

AzurePackage.proj

Upgrading Orchard.Azure to Windows Azure SDK 2.1. Implementing dynamic inclusion of theme and module content via role content folders. Moving Orchard.Azure.Web startup task to Orchard.Azure.CloudService.