Merge branch 'MDL-61519-master' of https://github.com/MartinGauk/moodle
commit3f6ede91aaa2cc6ae1f1bb3b0cecb7fce0e8738e
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Mar 2018 05:53:36 +0000 (20 13:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Mar 2018 05:53:36 +0000 (20 13:53 +0800)
tree828906640c07da70efdc3b22ab9af54c4b1652b0
parentf78a8a52a505ee31f8e1a958cc0a0814d5ce235a
parentc4172077dfd9432f9aa40aa8a0b7ab9e094359e6
Merge branch 'MDL-61519-master' of https://github.com/MartinGauk/moodle