Merge branch 'MDL-66835' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 9 Oct 2019 12:44:45 +0000 (20:44 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 9 Oct 2019 12:44:45 +0000 (20:44 +0800)

Trivial merge