Merge branch 'pr/196' into develop

Browse Source

# Conflicts:
#	dist/plyr.js

...

This commit is contained in:

Sam Potts

2016-04-30 11:08:42 +10:00

parent 97870a7cdc 48399f6364

commit aa093b6c42

2 changed files with 177 additions and 47 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

4

dist/plyr.js vendored

File diff suppressed because one or more lines are too long