Merge branch 'MDL-53226-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:15:52 +0000 (18:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:15:52 +0000 (18:15 +0200)
commitbdb22af959f1b7d5f4659802b04c213e6e32e6ff
tree85eb75cb7567475107a57d10cbb55587b30fd6dd
parentc3f771aeba8360a66d093061a4307a764e4ec281
parentadd8d846d938d944b1d0cecdcfd25d9f4ee177af
Merge branch 'MDL-53226-master' of git://github.com/andrewnicols/moodle
lib/db/upgrade.php
search/engine/solr/tests/engine_test.php
version.php