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

# Conflicts:
#	demo/dist/demo.js
#	demo/src/js/main.js
#	dist/plyr.js
#	notes.md
#	src/js/plyr.js

2017-05-16 10:17:04 +10:00

..

dist

Vimeo demo bug fix + repo move

2017-05-16 10:08:59 +10:00

src

Vimeo demo bug fix + repo move

2017-05-16 10:08:59 +10:00

webvtt

Manually merged #385

2016-10-01 22:07:01 +10:00

error.html

Manually merged #385

2016-10-01 22:07:01 +10:00

index.html

Merge branch 'master' into develop

2017-05-16 10:17:04 +10:00