Merge branch 'MDL-69664-310' of git://github.com/junpataleta/moodle into MOODLE_310_S...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2020 15:36:01 +0000 (17:36 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 17 Sep 2020 07:16:52 +0000 (09:16 +0200)

Trivial merge