Merge branch 'wip-MDL-59468-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Jul 2017 02:25:23 +0000 (04:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Jul 2017 02:25:23 +0000 (04:25 +0200)
commit2ae3581d6305a92d53c1ceac861018f0ea3941b0
tree1c7366cd2d30c510e5f9d73181d9172e65083943
parent350700bf8b509f5269b0fefd34fec0d3d5393c99
parent63470cf31ccabcbeae9e10732baa24c1f01a2bc8
Merge branch 'wip-MDL-59468-master' of https://github.com/marinaglancy/moodle