Merge branch 'master' of github.com:selz/plyr

Browse Source

# Conflicts:
#	dist/plyr.js

...

This commit is contained in:

Sam Potts

2016-02-13 22:19:31 +11:00

parent ce51344269 89e000f669

commit aea86b6124

3 changed files with 30 additions and 16 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