Merge branch 'MDL-68656-master' of https://github.com/catalyst/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2020 23:13:22 +0000 (01:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2020 23:13:22 +0000 (01:13 +0200)
commit4c6a9740f7cd7baf432fd10870b2419747628adf
tree9ad6597caf2322bc1c1cd773af91b98f3f512e1d
parent2418c12c602305381aca1dfee935d1df91efbca2
parent142a02308dd4dea65138333ad63430a7394f607a
Merge branch 'MDL-68656-master' of https://github.com/catalyst/moodle