Merge branch 'wip-MDL-60241-33' of git://github.com/marinaglancy/moodle into MOODLE_3...
commitcda6d082de9cde0fdc45e6804ee2d00bf548d2bf
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 17:29:00 +0000 (12 18:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 17:29:00 +0000 (12 18:29 +0100)
tree35b10ee50e50ad6721cc9dcac3b8763eeadc3e0d
parenteb12fec156ade8336672b07f770bb2a3817b9378
parent3e316b8713010d06f46831659c8031bd571b36ad
Merge branch 'wip-MDL-60241-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE