Merge branch 'MDL-70153-310' of git://github.com/dpalou/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Nov 2020 03:27:14 +0000 (11:27 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:54:26 +0000 (12:54 +0100)
commit4dba8e83594d6e199bd97f360d4092fe49da41f6
tree3b89cfbdcfef0b83ccdcafc5eb70939bab6fbb13
parentf03c875cf30c6e36cb2ff1566adcd1b4c20342ac
parentb76093e90c711bb7f4f94794f6c3b1546cbd44d5
Merge branch 'MDL-70153-310' of git://github.com/dpalou/moodle into MOODLE_310_STABLE