Sebastien Ros bca5aee822 Merge branch 'refs/heads/1.10.x' into dev ...

# 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

2017-04-25 09:04:16 -07:00

..

msbuildtasks

Including msbuild tasks in lib

2016-01-14 12:04:45 -08:00

msdeploy

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

nhibernate.linq

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

nuget

Restoging nuget packages as part as the build script

2016-01-13 18:07:18 -08:00

slowcheetah

Adding missing SlowCheetah assembly

2016-01-14 14:57:24 -08:00

sqlce

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00

vswhere

Supportin VS2017 in build.cmd

2017-04-24 11:13:42 -07:00

wcat

Converting all files stored as CRLF in git to be stored as LF

2015-12-13 22:21:02 +01:00