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 @@ Name: Custom Forms
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardcustomforms.codeplex.com
Version: 1.8.1
OrchardVersion: 1.8
Version: 1.9.0
OrchardVersion: 1.9
Description: Create custom forms like contact forms or content contributions.
Features:
Orchard.CustomForms:

View File

@@ -10,7 +10,7 @@ using System.Security;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Orchard")]
[assembly: AssemblyCopyright("Copyright <20> Outercurve Foundation 2012")]
[assembly: AssemblyCopyright("Copyright <20> .NET Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +31,5 @@ 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")]