Sam Potts 12c6282d14 Merge branch 'develop' into css-variables ...

# Conflicts:
#	.eslintrc
#	demo/dist/demo.css
#	demo/dist/demo.js
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs
#	dist/plyr.min.mjs.map
#	dist/plyr.mjs
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs
#	dist/plyr.polyfilled.min.mjs.map
#	dist/plyr.polyfilled.mjs
#	gulpfile.js
#	package.json

2019-06-01 19:55:14 +10:00

..

dist

Merge branch 'develop' into css-variables

2019-06-01 19:55:14 +10:00

media

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

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

src

Clean up

2019-06-01 19:50:29 +10:00

error.html

Style fixes

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

index.html

Merge branch 'develop' into css-variables

2019-06-01 19:55:14 +10:00