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

Browse Source

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

...

This commit is contained in:

Sam Potts

2017-03-28 09:30:37 +11:00

parent 55dfab8394 18bf4d84b9

commit 535c046b62

5 changed files with 199 additions and 92 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

4

dist/plyr.js vendored

File diff suppressed because one or more lines are too long