Sam Potts 70297321c3 Merge branch 'develop' of github.com:selz/plyr into develop ...

# Conflicts:
#	.gitignore
#	dist/plyr.css
#	dist/plyr.js
#	dist/sprite.svg
#	docs/dist/docs.css
#	docs/dist/docs.js
#	docs/src/less/components/examples.less
#	src/js/plyr.js
#	src/less/plyr.less
#	src/sprite/icon-fast-forward.svg
#	src/sprite/icon-pause.svg
#	src/sprite/icon-play.svg
#	src/sprite/icon-rewind.svg

2016-04-25 19:10:10 +10:00

..

dist

UI tweaks

2016-04-25 19:06:55 +10:00

src

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

2016-04-25 19:10:10 +10:00

error.html

Small bug fixes

2016-01-21 09:43:27 +11:00

index.html

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

2016-04-25 19:10:10 +10:00