lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-26 12:03:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into 1.10

Browse Source 
Conflicts:
	src/Orchard/Orchard.Framework.csproj
This commit is contained in:
Sebastien Ros
2016-02-01 09:33:02 -08:00
parent 59d20c3d40 787b5d89b3
commit 1205f3ae5a
34 changed files with 246 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
View File

@@ -1,7 +1,7 @@
Name: Orchard.ContentPicker
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardcontentpicker.codeplex.com
Website: https://github.com/OrchardCMS/Orchard
Version: 1.9.2
OrchardVersion: 1.9
Description: UI for selecting Content Items.
@@ -9,4 +9,4 @@ Features:
Orchard.ContentPicker:
Description: UI for selecting Content Items.
Dependencies: Contents, Navigation
Category: Input Editor
Category: Input Editor