Merge branch 'MDL-64324-master-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 22:12:47 +0000 (23:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 22:12:47 +0000 (23:12 +0100)
commit5dda368407f40e3601e3ef3df5eaca7afebbfb53
treeee9dde72a8943891698586cabda62044095361d6
parentb16bb4919240bdef1e9a532e14ab6e0d11fa19c0
parent48f9ebcd62665b5cbb037e1e5031b03182091252
Merge branch 'MDL-64324-master-fix' of https://github.com/marinaglancy/moodle