Merge branch 'MDL-63266-311' of git://github.com/peterRd/moodle into MOODLE_311_STABLE
commit0873a544eddc96049f47e897b36abfc573af0b2f
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Nov 2020 03:37:22 +0000 (26 11:37 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:51:53 +0000 (26 12:51 +0100)
treee98ea85f14e24fb8bec30b18006b86e1dbd1d163
parent41e1eecf361fef268fe04fc7db302bf9e8bbeffa
parentb505b893fc04715a0895a12c77cdb7cbcfd1518d
Merge branch 'MDL-63266-311' of git://github.com/peterRd/moodle into MOODLE_311_STABLE