Merge branch 'master' into develop

Browse Source

# Conflicts:
#	demo/index.html
#	dist/plyr.js

...

This commit is contained in:

Sam Potts

2016-11-06 15:55:55 +11:00

parent 72404e77e5 73a1391f2f

commit bae04a492a

5 changed files with 83 additions and 22 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