Merge branch '1.8.2-int' into 1.9-int

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
155 changed files with 289 additions and 293 deletions

View File

@@ -2,10 +2,10 @@
AntiForgery: enabled
Author: Sébastien Ros
Website: http://orchardproject.net
Version: 1.8.1
Version: 1.8.2
OrchardVersion: 1.8
Description: Provides an API to cache business data.
Features:
Orchard.Caching:
Description: Provides an API to cache business data.
Category: Performance
Category: Performance