Merge branch 'beta' into beta-with-ads

Browse Source

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

...

This commit is contained in:

Sam Potts

2018-01-14 22:55:44 +11:00

parent bbdf225d7b 5f96ec6ac2

commit cfc86bcb7c

6 changed files with 9 additions and 19 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