Merge branch 'MDL-67523-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 29 Dec 2019 22:31:59 +0000 (23:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 29 Dec 2019 22:31:59 +0000 (23:31 +0100)
commitc5fb4dc40fa83c97c2894dd1323a39f195223127
tree52c29402363f12d02468c06fd2bdcedc17d734fe
parenta0ba8feef6e5d97da26e55b8511eee38f2075ba4
parent4e4e6311a50b1bb8d1304ac87dffec3b348e09d7
Merge branch 'MDL-67523-master' of git://github.com/marinaglancy/moodle