Merge branch 'develop' into a11y-improvements

Browse Source

# Conflicts:
#	demo/dist/demo.css
#	dist/plyr.css
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	package.json
#	src/js/plyr.js

...

This commit is contained in:

Sam Potts

2018-07-30 23:09:12 +10:00

parent 599b33e55f 2679c5898e

commit dae272ef66

31 changed files with 260 additions and 26739 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

1

demo/dist/demo.css vendored

File diff suppressed because one or more lines are too long

4410

demo/dist/demo.js vendored

File diff suppressed because it is too large Load Diff

1

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

1

demo/dist/demo.min.js.map vendored

File diff suppressed because one or more lines are too long

1

demo/dist/error.css vendored

File diff suppressed because one or more lines are too long