Merge branch 'develop' into css-variables

Browse Source

# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.min.js.map
#	demo/index.html
#	dist/plyr.css
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs.map
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs.map
#	gulpfile.js
#	src/sass/base.scss
#	src/sass/components/control.scss
#	src/sass/settings/colors.scss
#	src/sass/settings/controls.scss

...

This commit is contained in:

Sam Potts

2020-03-30 10:45:57 +11:00

parent 50a7c2fad6 ad63af5096

commit da943b384c

110 changed files with 27759 additions and 10721 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