Merge branch 'develop' into css-variables

Browse Source

# Conflicts:
#	demo/dist/demo.css
#	demo/index.html
#	dist/plyr.css
#	gulpfile.js
#	package.json
#	yarn.lock

...

This commit is contained in:

Sam Potts

2019-03-16 12:14:20 +11:00

parent bdd513635f c202551e6d

commit 35f7ee9c59

56 changed files with 24998 additions and 14943 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

dist/plyr.css vendored

File diff suppressed because one or more lines are too long