Merge branch 'MDL-68677-master' of git://github.com/andrewnicols/moodle
commit036b1beb4950365d2c501fef88494fabf3f6402d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 May 2020 23:58:41 +0000 (15 01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 14 May 2020 23:58:41 +0000 (15 01:58 +0200)
tree5326d4cff877a7c3281ea7e3e9d54174e600376f
parentd2a0e106c6d952673fce762bedd02d8ebc3222e6
parent84d8b45fdfb634f9415982fdfc4827439ddca806
Merge branch 'MDL-68677-master' of git://github.com/andrewnicols/moodle