Merge branch 'master' into develop

Browse Source

# Conflicts:
#	changelog.md
#	dist/plyr.js

...

This commit is contained in:

Sam Potts

2015-07-20 22:25:31 +10:00

parent cdf3deb458 b5fc21239b

commit 8894b4c7b9

7 changed files with 59 additions and 25 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