mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
# Conflicts: # src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Views/Asset/Edit.cshtml # src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Views/EditorTemplates/Parts/CloudVideo.cshtml # src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Views/Settings/Index.cshtml # src/Orchard.Web/Modules/Orchard.Resources/Assets.json # src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj # src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Moment.cs # src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Uri.cs # src/Orchard.Web/Modules/Orchard.Resources/Scripts/Moment/moment.js # src/Orchard.Web/Modules/Orchard.Resources/Scripts/Moment/moment.min.js # src/Orchard.Web/Modules/Orchard.Resources/Scripts/Uri/uri.js # src/Orchard.Web/Modules/Orchard.Resources/Scripts/Uri/uri.min.js