Merge with 3.7

This commit is contained in:
Romain Neutron
2012-10-04 12:49:01 +02:00
48 changed files with 353 additions and 89 deletions

View File

@@ -59,6 +59,7 @@ $groups = array(
, '//include/jslibs/json2.js'
, '//include/jslibs/colorpicker/js/colorpicker.js'
, '//include/jslibs/jquery.mousewheel.js'
, '//include/jslibs/jquery.lazyload/jquery.lazyload.1.8.1.js'
, '//include/jslibs/jquery-ui-1.8.17/jquery-ui-i18n.js'
, '//include/jslibs/jquery.cookie.js'
, '//include/jquery.common.js'