Merge branch 'beta' of github.com:sampotts/plyr into beta

Browse Source

# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map

...

This commit is contained in:

Sam Potts

2018-02-05 21:28:16 +11:00

parent 1ee88cba16 af3ae75229

commit f3ea31c515

16 changed files with 60 additions and 32 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

demo/dist/demo.css vendored

File diff suppressed because one or more lines are too long