Merge branch 'master' into develop

Browse Source

# Conflicts:
#	.eslintrc
#	demo/dist/demo.css
#	demo/dist/demo.js
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs
#	dist/plyr.min.mjs.map
#	dist/plyr.mjs
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs
#	dist/plyr.polyfilled.min.mjs.map
#	dist/plyr.polyfilled.mjs
#	package.json
#	readme.md
#	src/js/listeners.js
#	yarn.lock

...

This commit is contained in:

Sam Potts

2019-06-20 23:56:19 +10:00

parent 2e40b91ec1 1e761e237a

commit e8e2b8ba39

23 changed files with 2472 additions and 2435 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

889

demo/dist/demo.js vendored

File diff suppressed because it is too large Load Diff

2

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