Merge branch 'develop' of github.com:sampotts/plyr into develop

Browse Source

# Conflicts:
#	src/js/captions.js
#	src/js/controls.js
#	src/js/fullscreen.js
#	src/js/html5.js
#	src/js/listeners.js
#	src/js/plugins/youtube.js
#	src/js/plyr.js
#	src/js/utils.js

...

This commit is contained in:

Sam Potts

2018-06-13 00:41:30 +10:00

parent 392dfd024c 7158e507ad

commit aae1092bac

20 changed files with 667 additions and 797 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