lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-07 16:13:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/1.10.x' into dev

Browse Source 
# Conflicts:
#	src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
#	src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs
#	src/Orchard.Web/Modules/Orchard.Fields/Module.txt
#	src/Orchard.Web/Modules/Orchard.Forms/Module.txt
#	src/Orchard.Web/Modules/Orchard.Localization/Module.txt
#	src/Orchard.Web/Modules/Orchard.Projections/Module.txt
#	src/Orchard.Web/Modules/Orchard.Resources/Scripts/Calendars/jquery.calendars.min.min.js
#	src/Orchard.Web/Modules/Orchard.TaskLease/Module.txt
#	src/Orchard.Web/Modules/Orchard.Tokens/Module.txt
This commit is contained in:
Sebastien Ros
2017-04-25 09:04:16 -07:00
parent 6e05649c51 683a37800c
commit bca5aee822
177 changed files with 279 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/vswhere/vswhere.exe Normal file
View File

Binary file not shown.