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

Browse Source

# Conflicts:
#	src/js/plyr.js

...

This commit is contained in:

Sam Potts

2016-02-21 14:04:13 +11:00

parent b18ed03384 6a0b3dc823

commit cad142fe85

9 changed files with 110 additions and 95 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

dist/plyr.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long

dist/plyr.js

Vendored

+2 -2

File diff suppressed because one or more lines are too long