Merge branch 'master' into develop

# Conflicts:
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
This commit is contained in:
Sam Potts
2018-06-11 16:48:54 +10:00
16 changed files with 489 additions and 434 deletions

View File

@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
// plyr.js v3.3.10
// plyr.js v3.3.11
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================