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

Browse Source

# Conflicts:
#	dist/plyr.css

...

This commit is contained in:

Sam Potts

2016-05-14 00:48:56 +10:00

parent 7f624ebbb7 31c933af38

commit 448c070898

5 changed files with 69 additions and 30 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.css vendored

File diff suppressed because one or more lines are too long