Merge branch 'MDL-65327_master' of https://github.com/marxjohnson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Oct 2019 17:27:49 +0000 (19:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Oct 2019 17:27:49 +0000 (19:27 +0200)

Trivial merge