Merge branch 'MDL-62368_master' of git://github.com/markn86/moodle
commite63a4ae54080b951e2fe291378f95fe8b0eaa08c
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 15:59:20 +0000 (11 17:59 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 15:59:20 +0000 (11 17:59 +0200)
tree512c5e883b06d0d3d5c57dadd8b2202af68f6758
parent76fc9a4f5a87bd80e8d1c11eef2d66d9b6f66413
parent3e642074eeb73e62da7f4d9007fa75d6b4a14206
Merge branch 'MDL-62368_master' of git://github.com/markn86/moodle