Merge branch 'MDL-69135-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 9 Jul 2020 02:35:33 +0000 (10:35 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 9 Jul 2020 02:35:33 +0000 (10:35 +0800)
commit336d0d2927d4ed215589c19f2f48367e3a185292
tree4e6598c9e1e8d27808405707eb0819af74cda48f
parentf1d86e031906620e7f980078da87299fa35ea4d3
parent94711c151d54bb0e0b95e9f7be87421a6300a2b3
Merge branch 'MDL-69135-master' of git://github.com/andrewnicols/moodle