Merge branch 'MDL-67622_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 17:55:45 +0000 (18:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 17:55:45 +0000 (18:55 +0100)

Trivial merge