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

Browse Source

# Conflicts:
#	package.json
#	yarn.lock

...

This commit is contained in:

Sam Potts

2020-03-29 12:02:59 +11:00

parent ef7b30c1b8 155add66bd

commit 09598f07bf

34 changed files with 2264 additions and 1929 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

1004

demo/dist/demo.js vendored

File diff suppressed because it is too large Load Diff

4

demo/dist/demo.min.js vendored

File diff suppressed because one or more lines are too long

2

demo/dist/demo.min.js.map vendored

File diff suppressed because one or more lines are too long