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

Browse Source

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

...

This commit is contained in:

Sam Potts

2015-03-10 23:57:36 +11:00

parent aa6bc2df2f a16579fd21

commit b677c3d7ad

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

2

dist/plyr.js vendored

File diff suppressed because one or more lines are too long