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

# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	src/js/plyr.js
#	src/less/plyr.less
#	src/scss/plyr.scss

2017-03-25 11:24:38 +11:00

..

plyr.css

Merge branch 'master' into develop

2017-03-25 11:24:38 +11:00

plyr.js

Merge branch 'master' into develop

2017-03-25 11:24:38 +11:00

plyr.svg

Work on PiP

2016-10-23 21:21:42 +11:00