Sam Potts 87078d7a44 Merge branch 'master' into develop ...

# Conflicts:
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs
#	dist/plyr.min.mjs.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs
#	dist/plyr.polyfilled.min.mjs.map
#	yarn.lock

2020-11-14 13:35:22 +11:00

..

demo.css

pkg: deploy v3.6.3

2020-11-14 13:29:47 +11:00

demo.js

Merge branch 'master' into develop

2020-11-14 13:35:22 +11:00

demo.min.js

pkg: deploy v3.6.3

2020-11-14 13:29:47 +11:00

demo.min.js.map

pkg: deploy v3.6.3

2020-11-14 13:29:47 +11:00

demo.svg

Prepare for 3.5.7 release

2020-01-30 11:34:07 +00:00

error.css

Added local server, package upgrades

2020-01-13 15:49:29 +00:00