Merge branch 'MDL-38099-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Apr 2018 12:14:20 +0000 (14:14 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 Apr 2018 12:14:20 +0000 (14:14 +0200)
commitb1e5899c250db62c37f1af27d2c0b4c001cb046e
tree9c21210e5c44ae2baba2553f22f6652c55661e47
parenta53d48e0e3ddb408e1e066607d62fa3b0ef42730
parenta07249826a0a4a4febaf9c70b8f6229cc230ff82
Merge branch 'MDL-38099-master' of https://github.com/lucaboesch/moodle