mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Merge branch '1.9.x' into dev
Conflicts: README.md src/Orchard.Web/Modules/Orchard.DynamicForms/Controllers/FormController.cs src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/CheckboxElementDriver.cs src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EmailFieldElementDriver.cs src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/EnumerationElementDriver.cs src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/HiddenFieldElementDriver.cs src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/RadioButtonElementDriver.cs src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextAreaElementDriver.cs src/Orchard.Web/Modules/Orchard.DynamicForms/Drivers/TextFieldElementDriver.cs src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HeadingElementDriver.cs src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs src/Orchard.Web/Modules/Orchard.Layouts/Drivers/MarkdownElementDriver.cs src/Orchard.Web/Modules/Orchard.Layouts/Drivers/TextElementDriver.cs src/Orchard.Web/Modules/Orchard.Layouts/Filters/TokensFilter.cs src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Html.cshtml src/Orchard/Orchard.Framework.csproj
This commit is contained in:
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
|
||||
[assembly: AssemblyVersion("1.9.0")]
|
||||
[assembly: AssemblyFileVersion("1.9.0")]
|
||||
[assembly: AssemblyVersion("1.9.1")]
|
||||
[assembly: AssemblyFileVersion("1.9.1")]
|
||||
|
Reference in New Issue
Block a user