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-11 17:13:09 +10:00

parent 1bc452c349 840e31a693

commit 6a6f3914c0

14 changed files with 17 additions and 17 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.min.js vendored

File diff suppressed because one or more lines are too long