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

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

View file

@ -186,7 +186,7 @@
<location>jquery</location>
<name>jQuery Migrate</name>
<license>MIT</license>
<version>1.2.1</version>
<version>1.4.0</version>
<licenseversion></licenseversion>
</library>
<library>