Merge branch 'develop'

# Conflicts:
#	changelog.md
#	demo/dist/demo.css
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js.map
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	package.json
#	readme.md
#	src/js/plyr.js
#	src/js/plyr.polyfilled.js
This commit is contained in:
Sam Potts
2018-06-29 00:43:02 +10:00
35 changed files with 486 additions and 323 deletions

View File

@ -1,6 +1,6 @@
// ==========================================================================
// Plyr Polyfilled Build
// plyr.js v3.3.20
// plyr.js v3.3.21
// https://github.com/sampotts/plyr
// License: The MIT License (MIT)
// ==========================================================================