Merge branch 'MDL-67043-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 8 Nov 2019 00:25:14 +0000 (08:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 8 Nov 2019 00:25:14 +0000 (08:25 +0800)
commit6f1b145ea8605180f49f31257645fc6d971ce501
treeb776e936db9c404c8b2c342a86fd1b494402a430
parented2fb5710f9fc323c840bdc8527ca61341c00db1
parent65ae2441f30518c120ca814e0a05946a74093750
Merge branch 'MDL-67043-master' of git://github.com/cescobedo/moodle
h5p/classes/player.php
lib/db/services.php