Merge branch 'MDL-63255-master' of git://github.com/vmdef/moodle
commit4941d2d97d02c33f1c6649d942a0279e950e67de
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2018 21:31:00 +0000 (3 23:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2018 21:31:00 +0000 (3 23:31 +0200)
treedab9fbb36cda8f0df2f012f8ba263aed4663e6f9
parentcf2fea1d25d627820559d47e542d95beb4dd6962
parentb93767f3ee712faa299b990dabcc6314ad781219
Merge branch 'MDL-63255-master' of git://github.com/vmdef/moodle