Sam Potts f8e4ba36e5 Merge branch 'master' into develop ...

# Conflicts:
#	changelog.md
#	dist/plyr.js.map
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js.map
#	package.json

2018-07-18 21:44:39 +10:00

..

dist

Merge branch 'master' into develop

2018-07-18 21:44:39 +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