mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-25 10:59:18 +08:00
# Conflicts: # src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj # src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj # src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs # src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml # src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs