lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 04:19:04 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '1.8.2-int' into 1.9-int

Browse Source 
Conflicts:
	src/Orchard.Profile/Tests/Profiling.feature.cs
	src/Orchard.Web/Modules/Orchard.jQuery/Scripts/jquery-ui-timepicker-addon.js
This commit is contained in:
Sebastien Ros
2015-04-28 11:44:09 -07:00
parent 02fbd2e1f2 8b9c25a0a0
commit d25eb61fe7
155 changed files with 289 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
Version: 1.8.1
Version: 1.8.2
OrchardVersion: 1.8
Description: The localization module enables the localization of content items.
Features:
@@ -30,4 +30,4 @@ Features:
Description: Enables transliteration of the autoroute slug when creating a piece of content.
Category: Content
Name: URL Transliteration
Dependencies: Orchard.Localization.Transliteration, Orchard.Autoroute
Dependencies: Orchard.Localization.Transliteration, Orchard.Autoroute