Merge branch 'MDL-70023-master' of git://github.com/marinaglancy/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2020 22:57:15 +0000 (23:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2020 22:57:15 +0000 (23:57 +0100)
commita765b5a170a932d0a4bcaddc310444d6524f1ecf
tree1a591aa92c153a4a8e042e4c7a9b66a845072963
parentc33f9670195fbbccb3b54e7a4f8ca3031a1f1b20
parent7fb6ce765ffdc9cfcbdcec8ae984bd6e9d428d1b
Merge branch 'MDL-70023-master' of git://github.com/marinaglancy/moodle into master