lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-11-24 08:46:48 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.10.x' into issue/8773

Browse Source 
# Conflicts:
#	.gitignore
#	ClickToBuild.cmd
#	lib/nuget/nuget.exe
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Web.config
#	src/Orchard.Web/Core/Orchard.Core.csproj
#	src/Orchard.Web/Modules/Lucene/Lucene.csproj
#	src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
#	src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj
#	src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj
#	src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config
#	src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj
#	src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
This commit is contained in:
Benedek Farkas
2024-04-04 20:53:50 +02:00
parent 832a0c8515 fb1aa73475
commit 39ea4c7f79
221 changed files with 375 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,5 +1,7 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
**/.vs/**
src/Rebracer.xml
# User-specific files
*.suo
@@ -190,5 +192,3 @@ src/Orchard.Azure/Orchard.Azure.CloudService/Staging/
#enable all /lib artifacts
!lib/**/*.*
**/.vs/*
src/Rebracer.xml