Sam Potts cfc86bcb7c Merge branch 'beta' into beta-with-ads ...

# Conflicts:
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	dist/plyr.js
#	dist/plyr.js.map

2018-01-14 22:55:44 +11:00

..

dist

Merge branch 'beta' into beta-with-ads

2018-01-14 22:55:44 +11:00

media

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

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

src

Merge branch 'beta' into beta-with-ads

2018-01-14 22:55:44 +11:00

error.html

Split up settings file

2017-12-20 18:00:05 +00:00

index.html

Publish script tweaks

2018-01-09 20:43:58 +11:00

index.local.html

Beta version up on https://plyr.io/beta and CDN

2018-01-09 20:25:46 +11:00