Sam Potts 2d4a166218 Merge branch 'develop' of https://github.com/Selz/plyr into develop ...

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

2017-11-20 10:48:53 +11:00

..

vimeo.js

Added ended and playing getters

2017-11-20 10:48:28 +11:00

youtube.js

Merge branch 'develop' of https://github.com/Selz/plyr into develop

2017-11-20 10:48:53 +11:00