Sam Potts 8894b4c7b9 Merge branch 'master' into develop ...

# Conflicts:
#	changelog.md
#	dist/plyr.js

2015-07-20 22:25:31 +10:00

..

dist

YouTube playback, docs update

2015-07-20 22:24:06 +10:00

src

YouTube playback, docs update

2015-07-20 22:24:06 +10:00

error.html

Version bump

2015-07-20 14:45:32 +10:00

index.html

Merge branch 'master' into develop

2015-07-20 22:25:31 +10:00

index.youtube.html

YouTube playback, docs update

2015-07-20 22:24:06 +10:00