Merge branch 'MDL-66404-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 8 Nov 2019 01:24:10 +0000 (09:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 8 Nov 2019 01:24:10 +0000 (09:24 +0800)
commit1e9615944484f7a89b12836b5ff54c3fc8cf02cb
tree42ea864c4a42910bfc672e9a47e2795311c058ea
parent284af93b5e26d33f83c93765cc1a14eecc968e1d
parent0477e526e49087dc14db83eb097065c229ee20c9
Merge branch 'MDL-66404-master' of git://github.com/cescobedo/moodle
h5p/classes/player.php
lang/en/h5p.php