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)
1  2 
h5p/classes/player.php
lib/db/services.php

Simple merge
Simple merge