Sam ee2cdb2c9b Merge branch 'master' into develop ...

# Conflicts:
#	dist/plyr.css
#	dist/plyr.js
#	docs/dist/docs.css
#	docs/dist/docs.js
#	docs/index.html
#	docs/src/js/docs.js
#	docs/src/less/components/icons.less
#	docs/src/less/components/type.less
#	docs/src/less/docs.less
#	gulpfile.js
#	package.json
#	src/js/plyr.js

2015-12-13 22:49:02 +11:00

..

plyr.css

Merge branch 'master' into develop

2015-12-13 22:49:02 +11:00

plyr.js

Removed Hogan from Docs (Fixes #128)

2015-12-11 10:41:29 +11:00

sprite.svg

Docs update - removed button counts temporarily

2015-11-26 18:26:26 +11:00