Merge branch 'wip-MDL-59259-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 23:09:47 +0000 (01:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 23:09:47 +0000 (01:09 +0200)
commit37c6bd9bedd14ca54f6fb5b963867deeb5562591
tree67adc151e002b648dbfeaf4e574baf363ce318de
parent6b82c53bf3707c8af0c28edd4bc847bf0a4a054f
parenta589b992f87c3089697fcf0517546fd4560f32bf
Merge branch 'wip-MDL-59259-master' of git://github.com/marinaglancy/moodle