lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/1.10.x' into dev

Browse Source 
# 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
This commit is contained in:
Sebastien Ros
2017-04-25 09:04:16 -07:00
parent 6e05649c51 683a37800c
commit bca5aee822
177 changed files with 279 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt
View File

@@ -2,7 +2,7 @@ Name: Orchard.ContentPermissions
AntiForgery: enabled
Author: Chris Pyle, S<>bastien Ros
Website: http://orchardproject.net
Version: 1.10.1
Version: 1.10.2
OrchardVersion: 1.9
Description: Allows item-level front end view permissions.
Features:

4
src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs
View File

@@ -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.10.1")]
[assembly: AssemblyFileVersion("1.10.1")]
[assembly: AssemblyVersion("1.10.2")]
[assembly: AssemblyFileVersion("1.10.2")]