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

Browse Source

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

...

This commit is contained in:

Sam Potts 2017-01-10 21:47:49 +11:00

parent c49d0a99e4 5a0cb9289c

commit 413fcbcb8c

2 changed files with 893 additions and 874 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats 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

1763

src/js/plyr.js

File diff suppressed because it is too large Load Diff