mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00

Conflicts: lib/windowsazure/Microsoft.WindowsAzure.Storage.xml src/Orchard.Specs/Hosting/Orchard.Web/Web.config src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TermCountProcessor.cs src/Orchard.Web/Web.config