Merge branch 'MDL-63453-38_media_videojs_upgrade' of https://github.com/mattporritt...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Oct 2019 22:48:56 +0000 (00:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Oct 2019 22:48:56 +0000 (00:48 +0200)

Trivial merge