Merge branch 'MDL-66360-master-fix' of git://github.com/lameze/moodle
commit237ddb313f627b4f167120b406d30973aa97b5a4
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Nov 2019 02:16:12 +0000 (12 10:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Nov 2019 02:16:12 +0000 (12 10:16 +0800)
tree3bd5a0cd40cb9aa88372445bd2d8bb1854e8ffcb
parent5f1307ef9aa3c658aafa8452f205367be734fe25
parent254fc008a7b588601a4288a233e2441bdf596723
Merge branch 'MDL-66360-master-fix' of git://github.com/lameze/moodle