Merge branch 'wip-MDL-61814-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 15:17:47 +0000 (17:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 May 2018 15:17:47 +0000 (17:17 +0200)
commit40cd9b66a6e59f62fddc1aa20f05bd2cfcb5642e
tree67446e95343855013458a03f4facc471cc74b538
parent5d2dd881e351f0bc4b0a983630c5bff7b9f3410b
parentb781f58e9107b8b776ccba741bbdd6793e54d411
Merge branch 'wip-MDL-61814-master' of git://github.com/abgreeve/moodle