Merge branch 'MDL-61578-master' of git://github.com/mickhawkins/moodle
commit5a0a8686e319d74349fe78c0ae22be3d3d57f041
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Jul 2018 08:45:55 +0000 (10 16:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Jul 2018 08:45:55 +0000 (10 16:45 +0800)
tree1407d1aabeb23d46db57d3a4cd90d2b4d27b6403
parent147b4f3dee42704d3e913ce6dd921fa1fd47ef2e
parent820f28c61b6e8f9335723cb14f264aef0849d44e
Merge branch 'MDL-61578-master' of git://github.com/mickhawkins/moodle