Merge branch 'MDL-63925-master' of git://github.com/mickhawkins/moodle
commit754ff36d1df8d5af7f895a4277dfe9eede7ed7a4
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Nov 2018 10:57:42 +0000 (12 11:57 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Nov 2018 10:57:42 +0000 (12 11:57 +0100)
tree082449330ad7ef3a71fe712980ca1b71821f778d
parentf04e51cfca56e2f047c0009aa18f243732d0498e
parente49b73e35e8926466a0eff43805e77b783983503
Merge branch 'MDL-63925-master' of git://github.com/mickhawkins/moodle