Merge branch 'wip-MDL-67545-master' of https://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jan 2020 18:28:56 +0000 (19:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jan 2020 18:28:56 +0000 (19:28 +0100)
commitfd27c57901b7f05a933ba137d1befa5c0c3139b6
tree5558e39b0874c7ac900c88d120bec17029583383
parent4ef4e10194ccf96645e2a1a8342600df10ee212d
parent7aa3444d72a3223bcce754bcac38150647e5709b
Merge branch 'wip-MDL-67545-master' of https://github.com/Beedell/moodle