Merge branch 'develop' into a11y-improvements

Browse Source

# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	src/js/controls.js
#	src/js/fullscreen.js
#	src/js/plyr.js
#	src/js/ui.js
#	src/js/utils.js

...

This commit is contained in:

Sam Potts

2018-06-17 01:26:24 +10:00

parent 6a6f3914c0 d4abb4b143

commit f1b4db4f36

51 changed files with 27362 additions and 27557 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

15451

dist/plyr.js vendored

File diff suppressed because it is too large Load Diff

2

dist/plyr.js.map vendored

File diff suppressed because one or more lines are too long

2

dist/plyr.min.js vendored

File diff suppressed because one or more lines are too long

2

dist/plyr.min.js.map vendored

File diff suppressed because one or more lines are too long

26602

dist/plyr.polyfilled.js vendored

File diff suppressed because it is too large Load Diff

2

dist/plyr.polyfilled.js.map vendored

File diff suppressed because one or more lines are too long

2

dist/plyr.polyfilled.min.js vendored

File diff suppressed because one or more lines are too long

2

dist/plyr.polyfilled.min.js.map vendored

File diff suppressed because one or more lines are too long