Merge branch 'master' into develop

Browse Source

# Conflicts:
#	changelog.md
#	dist/plyr.js.map
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js.map
#	package.json

...

This commit is contained in:

Sam Potts

2018-07-18 21:44:39 +10:00

parent f3d5389587 8616895e57

commit f8e4ba36e5

16 changed files with 460 additions and 46 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