Merge branch 'MDL-68977-master' of git://github.com/andrewnicols/moodle
commit2b983d29a030ce82098d468253b38c49d98047da
authorJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 07:36:44 +0000 (10 15:36 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 10 Jun 2020 07:36:44 +0000 (10 15:36 +0800)
treeb6e61e096ca482a3ba53575780506947e1865f61
parente5a2b74d8b53985d6cdf7d5b3f90500a61032539
parenta9075379d86757620069baf99f2edcfcdeb9b597
Merge branch 'MDL-68977-master' of git://github.com/andrewnicols/moodle