Merge branch 'master' into develop

Browse Source

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

...

This commit is contained in:

Sam Potts

2017-03-25 11:24:38 +11:00

parent ebc7ed538a 4957e4d80c

commit b083bf4297

10 changed files with 76 additions and 26 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.js vendored

File diff suppressed because one or more lines are too long