mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
# Conflicts: # .github/workflows/compile.yml # src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj # src/Orchard.Azure/Orchard.Azure.Web/packages.config # src/Orchard.Specs/Blogs.feature.cs # src/Orchard.Specs/DateTime.feature # src/Orchard.Specs/DateTime.feature.cs # src/Orchard.Specs/Hosting/Orchard.Web/Web.config # src/Orchard.Web/Modules/Orchard.Localization/Handlers/LocalizationPartHandler.cs # src/Orchard.Web/Web.config # src/Orchard.sln