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

Browse Source

# Conflicts:
#	dist/plyr.css
#	dist/plyr.js

...

This commit is contained in:

Sam Potts

2016-09-14 15:22:41 +10:00

parent c8b9c9bcaa d638cdcdd3

commit f608317eec

7 changed files with 128 additions and 118 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

4

dist/plyr.js vendored

File diff suppressed because one or more lines are too long