Merge branch 'MDL-61244-master-fix' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2018 08:36:30 +0000 (10:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2018 08:36:30 +0000 (10:36 +0200)
commit744a9de33952ae44d708bd3064d49ebabf8547c3
tree6c3699e9cbb91f3e18c03007f69a46e58e2f9a76
parent221a79361a944183a2021454e2aa3e4ca2257ea1
parent26ffa8e4d35e6f20ae79478a113ded886a45b5f8
Merge branch 'MDL-61244-master-fix' of git://github.com/junpataleta/moodle