Merge branch 'MDL-69582-310' of git://github.com/ferranrecio/moodle into MOODLE_310_S...
commitb2a382016f11b6935c089dadbbcea1a58f7fe146
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Oct 2020 20:44:29 +0000 (8 22:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Oct 2020 20:44:29 +0000 (8 22:44 +0200)
tree1ca65b0ae4ce0ab254163d57dc62948fba08b343
parentca80e9a68dae2e207c07a6dce2243cfb90c3002d
parent3540343ceb1f2883475a1bcc16c7ad4ca65ef725
Merge branch 'MDL-69582-310' of git://github.com/ferranrecio/moodle into MOODLE_310_STABLE