Merge branch 'MDL-63746-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Nov 2018 14:38:08 +0000 (15:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Nov 2018 14:38:08 +0000 (15:38 +0100)
commit8037dd6c15941b118bd5452c42ef981d7db81c7d
tree147458a7d05ce1009f2232900a4b15f208c97f49
parentd0b05c8d05592d3d3418ae22ecbe40b6f4ab725e
parentf9efe1bb101c095f65493de72fe8288d082e8dc3
Merge branch 'MDL-63746-master' of git://github.com/damyon/moodle