Merge branch 'wip-MDL-60591-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 21:35:58 +0000 (22:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 21:35:58 +0000 (22:35 +0100)
commit74454838735fcf69b7cd9a3caf3b974f31c0a966
treec5c27fb436a4e5bdc90b038d4b3ede509a50dd9d
parent25e9c561170f92f82ca9165ebff738ea8534978d
parente95df45bbac812ece3bd8700ec85b67f430eaf28
Merge branch 'wip-MDL-60591-master' of git://github.com/marinaglancy/moodle