Merge branch 'wip-MDL-59808-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 22:13:28 +0000 (00:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 22:13:28 +0000 (00:13 +0200)
commit0071665686e041c018ea4ef93ca8f6301f7a83a7
tree51d5acef0f42f8e164224d88461e4ba09476278e
parentf20f9448f7fb76689284d3cb7b04c964d8075436
parent9971fac80348237b17d1382974a1cbc6dec120ef
Merge branch 'wip-MDL-59808-master' of git://github.com/marinaglancy/moodle