moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 17:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-53455-master' of git://github.com/lameze/moodle

Browse source 
Conflicts:
	lib/jquery/plugins.php
This commit is contained in:
David Monllao 2016-03-22 09:44:49 +08:00
commit 01cd5aeef6
6 changed files with 721 additions and 525 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/jquery/plugins.php
View file

@ -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')),
);