Merge branch 'MDL-67062-master-fix' of https://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Feb 2020 11:54:30 +0000 (12:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Feb 2020 11:54:30 +0000 (12:54 +0100)
commitdf6071af65322a08bbc773b2c92d894bcb332ae2
tree1c828029b3e0b0380ff4b2cc249214c1c07bc2f0
parent9585a6fdf75a6d651545592ef9a14f356ad2b031
parent91ae2593d65e452a6d9f168d8427a56ae07d6f4a
Merge branch 'MDL-67062-master-fix' of https://github.com/sarjona/moodle