Merge branch 'develop' into a11y-improvements

Browse Source

# Conflicts:
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map

...

This commit is contained in:

Sam Potts

2018-06-18 22:17:34 +10:00

parent ffd864ed39 22d524ac9d

commit d64ed4ba5a

20 changed files with 291 additions and 266 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

demo/dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

2

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

File diff suppressed because one or more lines are too long