Merge branch 'MDL-70137-master-2' of git://github.com/andrewnicols/moodle
authorVíctor Déniz <victor@moodle.com>
Fri, 6 Nov 2020 19:14:58 +0000 (19:14 +0000)
committerVíctor Déniz <victor@moodle.com>
Fri, 6 Nov 2020 19:15:44 +0000 (19:15 +0000)
commit4aa279956f6cafe8de26b135deadeea763364740
tree680f8930d1dc71813ef40884ce866a87272bbd25
parent114102d37d88301988df4442eec1297d39b75d05
parentb8bf6f9c4228f1eb2f1b63d296e6631ffea53a4b
Merge branch 'MDL-70137-master-2' of git://github.com/andrewnicols/moodle