Merge branch 'MDL-62387' of https://github.com/paulholden/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2020 22:09:33 +0000 (00:09 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 17 Sep 2020 06:43:51 +0000 (08:43 +0200)

Trivial merge