Merge branch 'MDL-68918-master' of git://github.com/ferranrecio/moodle
commit99de0bb062fc138349bcb5df71cccfc619418601
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Jun 2020 02:47:24 +0000 (8 10:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Jun 2020 02:47:24 +0000 (8 10:47 +0800)
tree5a56d9602978abb84ffc53bcf464017e857fec94
parent346c51690c0f1805a3d5cca46bacffeb0eae3104
parent2bdd6b120c539f00154f2b713282e96eec8aa0d8
Merge branch 'MDL-68918-master' of git://github.com/ferranrecio/moodle