Merge branch 'MDL-63408_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 13:23:47 +0000 (21:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 13:23:47 +0000 (21:23 +0800)
commit8b5e087fc917dce9e0aea9a261fb9080580c263b
tree85133e369efe8a121a3090b8c320d423349053fd
parentccd8a102c7023906e48ab4fbbbb834453c98c1bf
parent4abe3d250f1c4c2599c8fcbfe73601e1b7bb4932
Merge branch 'MDL-63408_master-fix' of git://github.com/dmonllao/moodle