Merge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Oct 2016 10:22:07 +0000 (12:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Oct 2016 10:22:07 +0000 (12:22 +0200)
commitadc77f07c5c015ae0973bd65214c15f488f1fa45
tree47267c0c4a640bd488ccef95641e1eb84ec519e4
parent4f11002077148b130f7d416ef4b56684ad0a3c07
parent8643c576c7bcfca8e6ef9b50f6aaaa1084559149
Merge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle
course/externallib.php
course/tests/externallib_test.php
lang/en/error.php
lib/db/upgrade.php
lib/moodlelib.php
version.php