Merge branch 'MDL-67116-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 14 Nov 2019 04:37:22 +0000 (12:37 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 14 Nov 2019 04:37:22 +0000 (12:37 +0800)

Trivial merge