Merge with 3.7

2025-10-17 23:13:15 +00:00 · 2012-08-31 20:30:27 +02:00
parent 2944e19a65 e0fca1c89e
commit f27d50be81
19 changed files with 2109 additions and 50 deletions
--- a/www/include/minify/groupsConfig.php
+++ b/www/include/minify/groupsConfig.php
@@ -128,6 +128,10 @@ $groups = array(
        , '//include/jquery.common.js'
        , '//skins/lightbox/jquery.lightbox.ie6.js'
        , '//include/jslibs/flowplayer/flowplayer-3.2.11.min.js'
+    ),
+    'uploadflash' => array(
+        '//include/jslibs/SWFUpload/swfupload.js'
+        , '//include/jslibs/SWFUpload/plugins/swfupload.queue.js'
    )
 );