mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-26 20:16:15 +08:00
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