Merge branch 'MDL-61391-master' of git://github.com/damyon/moodle
commit72e72dd93f164d4bac19b30a91adc23a88661031
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:50:47 +0000 (22 16:50 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:50:47 +0000 (22 16:50 +0200)
tree5e63a913ebc0d3406758d43baf73997c8e87a864
parent64a00dffbd94fe4d530ac8754ea7b0600ed9e557
parent934ee47b0d6460ec3ed93494810d9d6491d5eeb2
Merge branch 'MDL-61391-master' of git://github.com/damyon/moodle