Merge branch 'develop' of github.com:selz/plyr into develop

Browse Source

# Conflicts:
#	dist/plyr.css

...

This commit is contained in:

Sam Potts

2016-04-28 18:35:21 +10:00

parent 85600ef685 f7edd84125

commit 4719766843

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