Merge branch 'MDL-66912-master' of https://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 21 Oct 2019 08:26:28 +0000 (16:26 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 21 Oct 2019 08:26:28 +0000 (16:26 +0800)

Trivial merge