Merge branch 'MDL-66970_master' of git://github.com/dmonllao/moodle
commita188424bb44e6527d7929c90340c16ef9344a123
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 21:59:18 +0000 (21 23:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 21:59:18 +0000 (21 23:59 +0200)
tree4b19bea1be37780009be90a685d5a0e4ebd21a3e
parent4019ae73f9c475cb8bc695ed8009a2d4e6103585
parentb4bb8688a580612d09d30166a27530c9c5d99e8c
Merge branch 'MDL-66970_master' of git://github.com/dmonllao/moodle