Merge branch 'MDL-49025' of https://github.com/NeillM/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 11:34:57 +0000 (13:34 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Jul 2018 11:34:57 +0000 (13:34 +0200)
commitaa59fb2ea2fc99356421a8f3c77003039f9de40c
treedc738cff5476b157070fb6be94e140b747003012
parent011c1a42918cd1ea88c60296b659a8f9c4af1c0c
parent650779d609786988f0700cc1054c469400d3ce39
Merge branch 'MDL-49025' of https://github.com/NeillM/moodle