Merge branch 'MDL-68038-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2020 18:45:05 +0000 (19:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Mar 2020 18:45:05 +0000 (19:45 +0100)
commit2ff7b7b0dae5b691df80c51e16ab836704a3823a
tree7639a7b0aff45b97e96ed8333eb04d68bf6d9038
parentbc988c0600d67cd694a971b880327f18d4f93128
parent3e3b6567956198e6ae75e7e86ebd66a295ecaeec
Merge branch 'MDL-68038-master' of git://github.com/sarjona/moodle