Merge branch 'MDL-57101-master-2nd' of git://github.com/FMCorz/moodle
commit3f342da58464c2fadc00fdea289caf2cdd07374e
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 04:09:29 +0000 (30 12:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 04:13:54 +0000 (30 12:13 +0800)
treea6da3d859d6381b1167bc3ca9355dd0d947a3e08
parent4495ddcf9f2c6862b59812a6663745dc25ab7482
parente37c1286864a9996e0a3ba22e19c55f3b7246b65
Merge branch 'MDL-57101-master-2nd' of git://github.com/FMCorz/moodle
media/player/videojs/amd/build/loader.min.js
media/player/videojs/classes/plugin.php