Merge branch 'master' into develop

Browse Source

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

...

This commit is contained in:

Sam Potts

2016-05-19 11:32:14 +10:00

parent 126f80ed78 72187a89dd

commit 0b7dc51bd1

33 changed files with 222 additions and 137 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.js

Vendored

+2 -2

File diff suppressed because one or more lines are too long