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)
commitacfbb4bf44c5f1c8baa6b9d6b79ecf19bfc35a47
treec8270786655712972e5e88d2462e89a4828728de
parentb80c1e015a206dd704ca8e662f61aae7f7f0b04d
parentcf3611450119b00423a8993802deccf7a2dc6505
Merge branch 'MDL-67146-master-enfix-2' of git://github.com/mudrd8mz/moodle
lang/en/h5p.php