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

Browse Source

# Conflicts:
#	dist/plyr.js
#	dist/plyr.js.map
#	src/js/controls.js

...

This commit is contained in:

Sam Potts

2017-11-18 19:33:01 +11:00

parent 4dca4bf93c 6984d6fb16

commit 5a244b7fed

33 changed files with 626 additions and 631 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.css vendored

File diff suppressed because one or more lines are too long