Merge branch 'MDL-67146-master-enfix-2' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 9 Nov 2019 15:11:39 +0000 (16:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 9 Nov 2019 15:11:39 +0000 (16:11 +0100)
1  2 
lang/en/h5p.php

diff --cc lang/en/h5p.php
Simple merge