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

# Conflicts:
#	dist/plyr.js
#	src/js/plyr.js
This commit is contained in:
Sam Potts
2017-03-29 09:05:25 +11:00
5 changed files with 26 additions and 15 deletions

4
dist/plyr.js vendored

File diff suppressed because one or more lines are too long