Sam Potts 7de9fd1d65 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

2018-06-29 00:43:02 +10:00

..

dist

Merge branch 'develop'

2018-06-29 00:43:02 +10:00

media

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

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

src

Linting, housekeeping, duration fix (fixes #1074)

2018-06-29 00:21:22 +10:00

error.html

Style fixes

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

index.html

Removed 1440p so I can afford to eat

2018-06-18 22:16:12 +10:00