Merge branch 'MDL-61621_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 10:57:38 +0000 (12:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 10:57:38 +0000 (12:57 +0200)
commita53d48e0e3ddb408e1e066607d62fa3b0ef42730
treeba687799be5db23b0f13121f981ccf31b0e67d61
parent76dacdb051e05bdcf663c23792c12de58b06e454
parent297509d70c67d9e6e81fe9f59c27ce18ffdb32fb
Merge branch 'MDL-61621_master' of git://github.com/dmonllao/moodle