Merge branch 'MDL-63614_M37v1' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Feb 2019 12:19:01 +0000 (13:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Feb 2019 12:19:01 +0000 (13:19 +0100)
commitc94dbc411f3d920677e38b7abf13b9c23d226eff
tree61ed784d396deae401fa0aa3674093b05d3780f0
parentd264253bd49431c9f5d24a4329f568c13affd7fb
parent3e42942d7329eac3b6a9f48eabf18ad47170cc3b
Merge branch 'MDL-63614_M37v1' of https://github.com/sbourget/moodle