Merge branch 'MDL-70242-310' of git://github.com/marinaglancy/moodle into MOODLE_310_...
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Nov 2020 02:49:19 +0000 (10:49 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:54:26 +0000 (12:54 +0100)
commit9fcb5ece12f92ee4ad98907f3b76e4faa4b21252
tree12386e0ddbf19533ef617247e6fbdaa5f4e96e3c
parentb07833ddf4923ee26d6583a14dfe2a72d9a7460e
parent2c4426bb10fc9faea3fcd7c87fdabdd5ee8fa06a
Merge branch 'MDL-70242-310' of git://github.com/marinaglancy/moodle into MOODLE_310_STABLE