Merge branch 'develop' into css-variables

Browse Source

# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	gulpfile.js
#	src/sass/components/captions.scss
#	src/sass/components/control.scss

...

This commit is contained in:

Sam Potts

2018-11-11 11:05:09 +11:00

parent 3e0a911418 2c8a337f26

commit b7b2e3c0aa

113 changed files with 28835 additions and 31149 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

8638

demo/dist/demo.js vendored

File diff suppressed because it is too large Load Diff

2

demo/dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

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