Merge branch 'MDL-62471_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 00:38:27 +0000 (02:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 00:38:27 +0000 (02:38 +0200)
commitd77104e28ce565fed3b6736924538bea59358c7b
tree75f2b9496f8c93efe1e00b3c11be459f9bc75df9
parent0eac61de66e68b4b08b3b667180842ad669dca1e
parent88b4c9d260f0509e485caeb3df9d8ff2d10d5180
Merge branch 'MDL-62471_master' of git://github.com/dmonllao/moodle