Sam Potts 5cecf16d4f Merge branch 'master' into develop ...

# Conflicts:
#	demo/dist/demo.js
#	dist/plyr.css
#	dist/plyr.js

2016-10-23 15:27:28 +11:00

..

plyr.css

Merge branch 'master' into develop

2016-10-23 15:27:28 +11:00

plyr.js

Merge branch 'master' into develop

2016-10-23 15:27:28 +11:00

plyr.svg

Icon fix

2016-09-06 23:50:59 +10:00