Merge branch 'MDL-67057-master' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Nov 2019 01:20:27 +0000 (09:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Nov 2019 01:20:27 +0000 (09:20 +0800)
1  2 
h5p/classes/player.php

Simple merge