Merge branch 'master' into develop

Browse Source

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

...

This commit is contained in:

Sam Potts

2016-10-23 15:27:28 +11:00

parent 21a30f1b6f a3ed309342

commit 5cecf16d4f

14 changed files with 104 additions and 33 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.css vendored

File diff suppressed because one or more lines are too long