Merge branch 'MDL-59454-master' of https://github.com/lucaboesch/moodle
commit30916022cabd22bea9b8e025e7cab79e20a2397a
authorDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 10:40:08 +0000 (31 11:40 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 10:40:08 +0000 (31 11:40 +0100)
tree97ef95102b60c0db1265985243dd25d3786f8215
parent07a64c681a7fcf5f293cce10d839dd598ef60c02
parente5abe2afbfe8f1a40e5a181f806b1492b35e9b3b
Merge branch 'MDL-59454-master' of https://github.com/lucaboesch/moodle