Merge branch 'MDL-61990' of https://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 14 Nov 2018 11:09:34 +0000 (12:09 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 14 Nov 2018 11:09:34 +0000 (12:09 +0100)
commitf2d83f50e155d7127e00cff49dbb682c96bded72
tree7356df3f5cbde9e70a4fc3dabac4e1cae1b56d02
parent03d9f4cda46ac30b19938cb8cf677ff2f64750bd
parent166c43d86c64f55c97a66284387861088811a66e
Merge branch 'MDL-61990' of https://github.com/timhunt/moodle