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

Browse Source

# Conflicts:
#	dist/plyr.css
#	src/less/plyr.less
#	src/scss/plyr.scss

...

This commit is contained in:

Sam Potts

2016-06-25 22:35:04 +10:00

parent 2fdcc18356 4c1cdea56e

commit be19b72719

35 changed files with 597 additions and 342 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

1

demo/dist/demo.css vendored Normal file

File diff suppressed because one or more lines are too long