Merge branch 'MDL-68789-master' of git://github.com/crazyserver/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 May 2020 21:43:05 +0000 (23:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 May 2020 21:43:05 +0000 (23:43 +0200)
commit08c6eca7e9cb3d3f58d61f2f63dbf2a3e893be06
tree8bfd31ca5830ee3a2ec2553822aa16ca6e99ecf5
parent68fd8d8bdfffc23b252c17f017e7cb573fdb3019
parenta87aa36ad9dd26f90e072e22daeb390b49890534
Merge branch 'MDL-68789-master' of git://github.com/crazyserver/moodle