Merge branch 'MDL-66004_master-delete_fix' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Oct 2019 16:41:36 +0000 (18:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Oct 2019 16:41:36 +0000 (18:41 +0200)

Trivial merge