Merge branch 'develop' into a11y-improvements

Browse Source

# Conflicts:
#	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

...

This commit is contained in:

Sam Potts

2018-06-19 19:24:47 +10:00

parent 9e1218547b 52ea5bd0ab

commit bb546fe43f

11 changed files with 85 additions and 86 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