Merge branch 'MDL-63523-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Oct 2018 21:22:52 +0000 (23:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Oct 2018 21:22:52 +0000 (23:22 +0200)
commitd2a2b9c45ad508d1a5f71a8e115a4d6ce9278ff0
treef33b5e36af35438a5fe5e3404bcecb2bd53e210a
parent32b01d2b02fac3d9a29d6cc6e129124968d73f9a
parentb36ee81ea6941030f11dc7a31233b8b6a3cfafd5
Merge branch 'MDL-63523-master' of git://github.com/jleyva/moodle