Merge branch 'MDL-53455-master' of git://github.com/lameze/moodle
Conflicts: lib/jquery/plugins.php
This commit is contained in:
@@ -38,7 +38,7 @@
|
||||
|
||||
$plugins = array(
|
||||
'jquery' => array('files' => array('jquery-1.12.1.min.js')),
|
||||
'migrate' => array('files' => array('jquery-migrate-1.2.1.min.js')),
|
||||
'migrate' => array('files' => array('jquery-migrate-1.4.0.min.js')),
|
||||
'ui' => array('files' => array('ui-1.11.4/jquery-ui.min.js')),
|
||||
'ui-css' => array('files' => array('ui-1.11.4/theme/smoothness/jquery-ui.min.css')),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user