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

Browse Source

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

...

This commit is contained in:

Sam Potts

2017-03-29 09:05:25 +11:00

parent 46fab972a0 535c046b62

commit 889712761a

5 changed files with 26 additions and 15 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