Merge branch 'MDL-68922-master' of git://github.com/sarjona/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 8 Jun 2020 02:16:53 +0000 (10:16 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 8 Jun 2020 02:16:53 +0000 (10:16 +0800)
1  2 
h5p/classes/editor.php

Simple merge