mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-04-05 21:01:35 +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 |
||
---|---|---|
.. | ||
Hyak.Common.dll | ||
Hyak.Common.xml | ||
Microsoft.ApplicationServer.Caching.AzureClientHelper.dll | ||
Microsoft.ApplicationServer.Caching.AzureCommon.dll | ||
Microsoft.ApplicationServer.Caching.AzureCommon.xml | ||
Microsoft.ApplicationServer.Caching.Client.dll | ||
Microsoft.ApplicationServer.Caching.Client.xml | ||
Microsoft.ApplicationServer.Caching.Core.dll | ||
Microsoft.ApplicationServer.Caching.Core.xml | ||
Microsoft.Azure.Common.dll | ||
Microsoft.Azure.Common.NetFramework.dll | ||
Microsoft.Azure.Common.NetFramework.xml | ||
Microsoft.Azure.Common.xml | ||
Microsoft.Azure.KeyVault.Core.dll | ||
Microsoft.Azure.KeyVault.Core.xml | ||
Microsoft.Data.Edm.dll | ||
Microsoft.Data.Edm.xml | ||
Microsoft.Data.OData.dll | ||
Microsoft.Data.OData.xml | ||
Microsoft.Data.Services.Client.dll | ||
Microsoft.Data.Services.Client.xml | ||
Microsoft.Practices.TransientFaultHandling.Core.dll | ||
Microsoft.Practices.TransientFaultHandling.Core.xml | ||
Microsoft.ServiceBus.dll | ||
Microsoft.ServiceBus.xml | ||
Microsoft.Threading.Tasks.dll | ||
Microsoft.Threading.Tasks.Extensions.Desktop.dll | ||
Microsoft.Threading.Tasks.Extensions.Desktop.xml | ||
Microsoft.Threading.Tasks.Extensions.dll | ||
Microsoft.Threading.Tasks.Extensions.xml | ||
Microsoft.Threading.Tasks.xml | ||
Microsoft.Web.DistributedCache.dll | ||
Microsoft.WindowsAzure.Configuration.dll | ||
Microsoft.WindowsAzure.Configuration.xml | ||
Microsoft.WindowsAzure.Diagnostics.dll | ||
Microsoft.WindowsAzure.Management.MediaServices.dll | ||
Microsoft.WindowsAzure.Management.MediaServices.xml | ||
Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer.dll | ||
Microsoft.WindowsAzure.MediaServices.Client.Common.FileEncryption.dll | ||
Microsoft.WindowsAzure.MediaServices.Client.dll | ||
Microsoft.WindowsAzure.MediaServices.Client.Extensions.dll | ||
Microsoft.WindowsAzure.ServiceRuntime.dll | ||
Microsoft.WindowsAzure.Storage.dll | ||
Microsoft.WindowsFabric.Common.dll | ||
Microsoft.WindowsFabric.Data.Common.dll | ||
MonAgentListener.dll | ||
System.IdentityModel.Tokens.Jwt.dll | ||
System.IdentityModel.Tokens.Jwt.pdb | ||
System.IdentityModel.Tokens.Jwt.xml | ||
System.Spatial.dll | ||
System.Spatial.xml | ||
Windows Azure SDK for Media Services Notice.docx | ||
WindowsAzureEventSource.dll | ||
WindowsAzureTelemetryEvents.dll |