Merge branch 'MDL-61858_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 16:06:50 +0000 (18:06 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 16:06:50 +0000 (18:06 +0200)
commit28e06c2a17524943100258c426bf8ab9ad84599b
tree1ac8c6c6909aed91d3b9c2dcd6e7356b472844e4
parente63a4ae54080b951e2fe291378f95fe8b0eaa08c
parentffc148ae39cf07d28678005e22ca32b64e8d267e
Merge branch 'MDL-61858_master' of git://github.com/markn86/moodle