Merge branch 'master' into 1.x

This commit is contained in:
Sebastien Ros
2015-05-05 21:40:02 -07:00
175 changed files with 526 additions and 502 deletions

View File

@@ -2,8 +2,8 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
Version: 1.8.1
OrchardVersion: 1.8
Version: 1.9.0
OrchardVersion: 1.9
Description: Description for the module
Features:
Orchard.Scripting.CSharp:

View File

@@ -31,6 +31,6 @@ using System.Security;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.8.1")]
[assembly: AssemblyFileVersion("1.8.1")]
[assembly: AssemblyVersion("1.9.0")]
[assembly: AssemblyFileVersion("1.9.0")]