Files
Orchard/CREDITS.txt
Sebastien Ros d25eb61fe7 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
2015-04-28 11:44:09 -07:00

8.6 KiB