Merge branch 'wip-MDL-60591-34' of git://github.com/marinaglancy/moodle into MOODLE_3...
commitaf4fa2a55bc333336f891c7e042c2b3f488a56dd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 21:38:37 +0000 (28 22:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 21:38:37 +0000 (28 22:38 +0100)
tree1253cad8af62991f34ecd484666e83a4424eeb63
parent15aec0b0542ab8b1f2c529fab5dc93981605df78
parent73e4f14d1b98a1bf88dbef8d3d50bb4e913c9cb7
Merge branch 'wip-MDL-60591-34' of git://github.com/marinaglancy/moodle into MOODLE_34_STABLE