Merge branch 'MDL-68714-master' of https://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 3 Jul 2020 03:58:17 +0000 (11:58 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 3 Jul 2020 03:58:17 +0000 (11:58 +0800)
commit5a3b9d64dd0604d0fc64182a65da1947ed175c5f
tree985eb3b2982fb13779e7f4c8efde8e01e57eba29
parentb5878eaec99b87ddd8e804b57b59e422e9abe6bf
parent9eaf7a4c3fbb814daa95384f6d39a8a784caf2ba
Merge branch 'MDL-68714-master' of https://github.com/andrewnicols/moodle