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

Browse Source

# Conflicts:
#	readme.md

...

This commit is contained in:

Sam Potts

2017-11-07 23:21:35 +11:00

parent fae4ca12e0 84505da84b

commit 3f41a0cf54

16 changed files with 439 additions and 337 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

dist/plyr.js vendored

File diff suppressed because one or more lines are too long