Merge branch 'MDL-66897-master-1' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 22 Jan 2020 15:17:14 +0000 (23:17 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 22 Jan 2020 15:17:14 +0000 (23:17 +0800)

Trivial merge