Merge branch 'MDL-67093-master' of git://github.com/andrewnicols/moodle
commitf33ea855bfc9d3fbbf49aa03b729da837c316949
authorJake Dallimore <jake@moodle.com>
Mon, 4 Nov 2019 07:36:34 +0000 (4 15:36 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 11:21:41 +0000 (4 19:21 +0800)
treeaf972149ff5874d8bf43cb5a76e56f2fd0ae9bff
parentb00b51aab62e9ccce316cf4f6c59dbedc65c738a
parentf2a901173e2c3c2f284411228b6e1bda1a32f6f5
Merge branch 'MDL-67093-master' of git://github.com/andrewnicols/moodle