Merge branch 'MDL-62660' of https://github.com/stronk7/moodle
commitd5bf22ecd1eb04d2e0dc3fa5f269a54af057a21b
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Aug 2018 00:02:47 +0000 (22 08:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Aug 2018 00:02:47 +0000 (22 08:02 +0800)
tree23d974076fc5a7c68949965fc4e78f48e516a180
parent3a6f371640d91dd85c612e0235a1ee5138c8a167
parent726c0ab9a3ce4fb7b74e2f7a4e9c9186c4118e68
Merge branch 'MDL-62660' of https://github.com/stronk7/moodle