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
#	src/js/captions.js

...

This commit is contained in:

Sam Potts

2018-06-11 16:54:20 +10:00

parent 38f10d4cc6 38f954ef17

commit 3fad6ed42c

29 changed files with 1519 additions and 1207 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.polyfilled.min.js vendored

File diff suppressed because one or more lines are too long