Sam Potts 95e39e7bd7 Merge branch 'master' into develop ...

# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	docs/dist/docs.css
#	docs/src/less/components/examples.less
#	src/js/plyr.js

2015-08-27 07:36:17 +10:00

..

docs.css

Vimeo

2015-08-27 07:30:14 +10:00

docs.js

YouTube, Captions and Control improvements

2015-08-08 14:37:12 +10:00

templates.js

YouTube, Captions and Control improvements

2015-08-08 14:37:12 +10:00