Merge branch 'develop' into css-variables

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
#	gulpfile.js
#	package.json

...

This commit is contained in:

Sam Potts

2019-06-01 19:55:14 +10:00

parent 996075decc 0249772f01

commit 12c6282d14

52 changed files with 15300 additions and 8732 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

1344

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

2

demo/dist/error.css vendored

File diff suppressed because one or more lines are too long