Sam Potts 44739a17d0 Merge branch 'master' into develop ...

# Conflicts:
#	changelog.md
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	demo/index.html
#	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
#	package.json
#	readme.md
#	yarn.lock

2019-01-26 16:50:37 +11:00

..

dist

Merge branch 'master' into develop

2019-01-26 16:50:37 +11:00

media

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

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

src

Merge branch 'master' into develop

2019-01-26 16:50:37 +11:00

error.html

Style fixes

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

index.html

Merge branch 'master' into develop

2019-01-26 16:50:37 +11:00