Merge branch 'MDL-61052-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 12:36:23 +0000 (14:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 12:36:23 +0000 (14:36 +0200)
commit57846fd010bf602ff48797d1383d9bb9d70c74f3
tree2bd40f962e8450c49dbb55ab2aeba90e7f3700e6
parentf7642bebc5636477a5199114dff5fd801f216c6d
parentefacf3a099d735863337bad5d979213cc5cd2c64
Merge branch 'MDL-61052-master' of git://github.com/damyon/moodle