Merge branch 'MDL-64686-master' of git://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Feb 2020 22:25:23 +0000 (23:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Feb 2020 22:25:23 +0000 (23:25 +0100)

Trivial merge