Sebastien Ros a0c61c0328 Merge branch '1.9.x' into dev ...

Conflicts:
	src/Orchard.Web/Modules/Orchard.ContentPermissions/Drivers/ContentPermissionsPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj

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

..

mono

Move Mono DLL from the Orchard.Scripting.CSharp module to the root lib folder

2015-12-22 21:57:25 +01:00

msbuild

Restored MSBuild directory

2016-01-06 10:53:24 +00: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

nunit

Restoring nunit console runner

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

sqlce

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

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

typescript

Enable TypeScript files to be built with a simple "build typescript" and without taking a dependency on Node.js

2015-03-20 20:14:37 -07:00

wcat

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

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