Merge branch 'MDL-69215-39-2' of git://github.com/andrewnicols/moodle into MOODLE_39_...
authorJun Pataleta <jun@moodle.com>
Thu, 16 Jul 2020 01:42:52 +0000 (09:42 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 16 Jul 2020 01:42:52 +0000 (09:42 +0800)

Trivial merge