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-02-05 11:36:53 +11:00

parent cbef45841c 96d9f302c2

commit 9c599884a8

4 changed files with 165 additions and 21 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