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-04-15 23:22:35 +10:00

parent 5d38497f07 808a3af3cf

commit 546cdaad92

2 changed files with 5 additions and 5 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

dist/plyr.js

Vendored

+2 -2

File diff suppressed because one or more lines are too long