Merge branch 'wip-MDL-62708-master' of https://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 14:52:50 +0000 (16:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 14:52:50 +0000 (16:52 +0200)
commitb8749c6208da264ad20e1ccf038b3b5729d2b956
tree43f47f7c52748759c6b76f958acabec51e42b189
parentfc008d676913634e23f08df4125a602c240cde4d
parentdfa85ad002f684cd1bd0a40407eebc7f5d5d178e
Merge branch 'wip-MDL-62708-master' of https://github.com/Beedell/moodle