Merge branch 'MDL-67316' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Apr 2020 01:39:04 +0000 (09:39 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Apr 2020 08:19:50 +0000 (10:19 +0200)

Trivial merge