Sam Potts b7b2e3c0aa Merge branch 'develop' into css-variables ...

# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	gulpfile.js
#	src/sass/components/captions.scss
#	src/sass/components/control.scss

2018-11-11 11:05:09 +11:00

..

dist

Merge branch 'develop' into css-variables

2018-11-11 11:05:09 +11:00

media

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

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

src

Styling tweaks

2018-11-08 23:18:04 +11:00

error.html

Style fixes

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

index.html

Keyboard and focus improvements

2018-07-15 19:23:28 +10:00