mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
Merge branch 'MDL-53455-master' of git://github.com/lameze/moodle
Conflicts: lib/jquery/plugins.php
This commit is contained in:
commit
01cd5aeef6
6 changed files with 721 additions and 525 deletions
|
@ -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>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue