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-10-08 19:12:55 +11:00

parent 3238b6a36a 02cb093f7b

commit 4392abfc49

4 changed files with 51 additions and 79 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.css vendored

File diff suppressed because one or more lines are too long

2

dist/plyr.js vendored

File diff suppressed because one or more lines are too long