Merge branch 'MDL-67971-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2020 18:02:22 +0000 (19:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2020 18:02:22 +0000 (19:02 +0100)
commitbc988c0600d67cd694a971b880327f18d4f93128
tree1c6285fdb8f3868f0e80c835d4d69e176112be4c
parentd0b087efa112f38a0cc36f3126666c9589ba866c
parent2f45b6f7cf3587c50f0e256f162f5a98b9757f5e
Merge branch 'MDL-67971-master' of git://github.com/sarjona/moodle