Merge branch 'mdl57404' of https://github.com/egiles/moodle
commitcb57d12d01fd6e98e76340d549ccf549d0f951a7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 23:02:30 +0000 (20 01:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 23:02:30 +0000 (20 01:02 +0200)
tree7df969a9b64501595aae836cafc8562c933f999e
parentb7dcb575d2204e3b3f52af45d63f935caeed6dca
parent53007faad1b1d4e806031f63c7fe5df2236ae35a
Merge branch 'mdl57404' of https://github.com/egiles/moodle