Merge branch 'MDL-62447_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 23:26:39 +0000 (01:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 23:26:39 +0000 (01:26 +0200)
commit51c17c381d218a0be209bd8390bc822aae329c9e
treefb28da05d69dd264b22f1b1d59a7f4592cf4e24d
parent3811659bc7f6faef86cbec0b23cdf9764dd785bf
parent7f9b187994a3c85838196b6937d4ba17c4aaa409
Merge branch 'MDL-62447_master' of git://github.com/dmonllao/moodle