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

..

dist

Merge branch 'master' into develop

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

media

Controls cleanup, work on captions bug, click to invert time

2017-11-18 19:30:26 +11:00

src

chore: revert customControls default option (to prevent breaking change)

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

error.html

Style fixes

2018-04-04 16:50:00 +10:00

index.html

Poster image fix (fixes #1763)

2020-04-19 20:06:58 +10:00

package.json

v3.6.3 (#2016)

2020-11-14 13:24:11 +11:00

yarn.lock

v3.6.3 (#2016)

2020-11-14 13:24:11 +11:00