MDL-70010 core: reconcile MOODLE_310_STABLE and master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Oct 2020 09:48:53 +0000 (10:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Oct 2020 09:48:53 +0000 (10:48 +0100)
commit0dbeb9748b5667900dbe194923b81dc5de212f1e
tree015e415f7d4d4b2db267ef786db66e9fbec3fd92
parentaed0ee06f9b441133e4ce4ebe75600b5fdc39bce
MDL-70010 core: reconcile MOODLE_310_STABLE and master

There are some unexpected differences between 310 and master,
better reconcile them now. Note this is not 100% critical but,
as far as nothing exclusively for 4.0 has landed to master yet
only branch/version differences should exist.
lib/db/upgrade.php
lib/phpunit/classes/phpunit_dataset.php