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

Browse Source

# Conflicts:
#	dist/plyr.js

...

This commit is contained in:

Sam Potts

2017-03-25 10:37:21 +11:00

parent 1a05f352c7 ba27de0669

commit 4a2866d05f

3 changed files with 62 additions and 6 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

4

dist/plyr.js vendored

File diff suppressed because one or more lines are too long