Merge branch 'wip-MDL-58530-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 19 Apr 2017 08:55:14 +0000 (16:55 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 19 Apr 2017 08:55:14 +0000 (16:55 +0800)
1  2 
media/player/videojs/styles.css

Simple merge