Merge branch 'MDL-67043-master' of git://github.com/cescobedo/moodle

author Andrew Nicols <andrew@nicols.co.uk>

Fri, 8 Nov 2019 00:25:14 +0000 (08:25 +0800)

committer Andrew Nicols <andrew@nicols.co.uk>

Fri, 8 Nov 2019 00:25:14 +0000 (08:25 +0800)
author Andrew Nicols <andrew@nicols.co.uk>
Fri, 8 Nov 2019 00:25:14 +0000 (08:25 +0800)
committer Andrew Nicols <andrew@nicols.co.uk>
Fri, 8 Nov 2019 00:25:14 +0000 (08:25 +0800)
diff --cc h5p/classes/player.php
Simple merge
diff --cc lib/db/services.php
Simple merge
author	Andrew Nicols <andrew@nicols.co.uk>
	Fri, 8 Nov 2019 00:25:14 +0000 (08:25 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Fri, 8 Nov 2019 00:25:14 +0000 (08:25 +0800)
		1	2
h5p/classes/player.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/db/services.php	patch \|	diff1 \|	diff2 \|	blob \| history