Merge branch 'MDL-46542' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Feb 2020 08:32:32 +0000 (09:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Feb 2020 08:32:32 +0000 (09:32 +0100)
commita8976119dc52544c0c5754f30bb3e95bafc24b4b
treed669b836efc8a8b65f9c5da8ca9d677c6992ccf1
parent097677f76505cb4f0568fb6f98a81a4808a1a7f1
parent87554981f0ec10cc076bfa345cfd13c5c37a39e0
Merge branch 'MDL-46542' of https://github.com/timhunt/moodle