Merge branch 'wip-MDL-59412-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:34:19 +0000 (09:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:34:19 +0000 (09:34 +0200)
commit29dcef0b658ba5e081f0357c33d942af9eb67f37
tree9eb54e432f87a63880b2a7112d9a50d1b0667226
parente1666575323dba2accd04df815a94d5c61828320
parent1c885118fcaa6f9c03dabf2287534c181a8a2e59
Merge branch 'wip-MDL-59412-master' of git://github.com/marinaglancy/moodle