Merge branch 'MDL-68229-310' of git://github.com/jleyva/moodle into MOODLE_310_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Sep 2020 09:51:16 +0000 (11:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Sep 2020 09:51:16 +0000 (11:51 +0200)

Trivial merge