Merge branch 'MDL-59567-master' of https://github.com/mackensen/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 01:30:59 +0000 (09:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jan 2018 01:30:59 +0000 (09:30 +0800)
commit0881745a9e4f512704a41b98edf142ea97896cae
treeaa014864db6ccae6fc4ab638c3506abe2a41f19d
parent5242a76a4b25dcbc4f73fe33ae7f7cf98cc46868
parent5976a78a95a218e36fce08ef6c668857e4e6a333
Merge branch 'MDL-59567-master' of https://github.com/mackensen/moodle